Factory::getApplication will always return the global app object (#18895)

laoneo · wilsonge · commit 2ec5345d365b · 2018-01-30T19:12:41.000Z
diff --git a/administrator/components/com_banners/Model/TracksModel.php b/administrator/components/com_banners/Model/TracksModel.php
@@ -484,7 +484,7 @@ public function getContent()
 
 			if ($this->getState('compressed'))
 			{
-				$app = \JFactory::getApplication('administrator');
+				$app = \JFactory::getApplication();
 
 				$files = array(
 					'track' => array(
diff --git a/administrator/components/com_categories/Model/CategoryModel.php b/administrator/components/com_categories/Model/CategoryModel.php
@@ -148,7 +148,7 @@ public function getTable($type = 'Category', $prefix = 'Administrator', $config
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('category.parent_id', $parentId);
diff --git a/administrator/components/com_fields/Model/FieldModel.php b/administrator/components/com_fields/Model/FieldModel.php
@@ -834,7 +834,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/administrator/components/com_installer/Model/InstallModel.php b/administrator/components/com_installer/Model/InstallModel.php
@@ -48,7 +48,7 @@ class InstallModel extends BaseDatabaseModel
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$this->setState('message', $app->getUserState('com_installer.message'));
 		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));
diff --git a/administrator/components/com_languages/Model/LanguageModel.php b/administrator/components/com_languages/Model/LanguageModel.php
@@ -76,7 +76,7 @@ public function getTable($name = '', $prefix = '', $options = array())
 	 */
 	protected function populateState()
 	{
-		$app    = \JFactory::getApplication('administrator');
+		$app    = \JFactory::getApplication();
 		$params = ComponentHelper::getParams('com_languages');
 
 		// Load the User state.
diff --git a/administrator/components/com_menus/Model/ItemModel.php b/administrator/components/com_menus/Model/ItemModel.php
@@ -943,7 +943,7 @@ protected function getReorderConditions($table)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/administrator/components/com_menus/Model/ItemsModel.php b/administrator/components/com_menus/Model/ItemsModel.php
@@ -80,7 +80,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
 
diff --git a/administrator/components/com_menus/Model/MenuModel.php b/administrator/components/com_menus/Model/MenuModel.php
@@ -93,7 +93,7 @@ public function getTable($type = 'MenuType', $prefix = '\JTable', $config = arra
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$id = $app->input->getInt('id');
diff --git a/administrator/components/com_menus/models/fields/menuitembytype.php b/administrator/components/com_menus/models/fields/menuitembytype.php
@@ -151,7 +151,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 
 			if (!$menuType)
 			{
-				$app = JFactory::getApplication('administrator');
+				$app = JFactory::getApplication();
 				$currentMenuType = $app->getUserState('com_menus.items.menutype', '');
 				$menuType        = $app->input->getString('menutype', $currentMenuType);
 			}
diff --git a/administrator/components/com_modules/Model/ModuleModel.php b/administrator/components/com_modules/Model/ModuleModel.php
@@ -105,7 +105,7 @@ public function __construct($config = array())
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/administrator/components/com_modules/Model/SelectModel.php b/administrator/components/com_modules/Model/SelectModel.php
@@ -36,7 +36,7 @@ class SelectModel extends ListModel
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the filter state.
 		$clientId = $app->getUserState('com_modules.modules.client_id', 0);
diff --git a/administrator/components/com_plugins/Model/PluginModel.php b/administrator/components/com_plugins/Model/PluginModel.php
@@ -222,7 +222,7 @@ protected function populateState()
 		// Execute the parent method.
 		parent::populateState();
 
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('extension_id');
diff --git a/administrator/components/com_tags/Model/TagModel.php b/administrator/components/com_tags/Model/TagModel.php
@@ -94,7 +94,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('tag.parent_id', $parentId);
diff --git a/administrator/components/com_templates/Model/StyleModel.php b/administrator/components/com_templates/Model/StyleModel.php
@@ -86,7 +86,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
@@ -160,7 +160,7 @@ public function getDirectoryTree($dir)
 	protected function populateState()
 	{
 		jimport('joomla.filesystem.file');
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/administrator/components/com_users/Model/DebuggroupModel.php b/administrator/components/com_users/Model/DebuggroupModel.php
@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');
diff --git a/administrator/components/com_users/Model/DebuguserModel.php b/administrator/components/com_users/Model/DebuguserModel.php
@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');
diff --git a/administrator/components/com_users/Model/UsersModel.php b/administrator/components/com_users/Model/UsersModel.php
@@ -70,7 +70,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.name', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		if ($layout = $app->input->get('layout', 'default', 'cmd'))
diff --git a/components/com_config/Model/ModulesModel.php b/components/com_config/Model/ModulesModel.php
@@ -31,7 +31,7 @@ class ModulesModel extends FormModel
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');
diff --git a/components/com_contact/Model/ContactModel.php b/components/com_contact/Model/ContactModel.php
@@ -62,7 +62,7 @@ class ContactModel extends FormModel
 	protected function populateState()
 	{
 		/** @var SiteApplication $app */
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		$this->setState('contact.id', $app->input->getInt('id'));
 		$this->setState('params', $app->getParams());
diff --git a/components/com_content/Model/ArchiveModel.php b/components/com_content/Model/ArchiveModel.php
@@ -83,7 +83,7 @@ protected function populateState($ordering = null, $direction = null)
 	protected function getListQuery()
 	{
 		$params           = $this->state->params;
-		$app              = \JFactory::getApplication('site');
+		$app              = \JFactory::getApplication();
 		$catids           = $app->input->getVar('catid', array());
 		$catids           = array_values(array_diff($catids, array('')));
 		$articleOrderDate = $params->get('order_date');
diff --git a/components/com_content/Model/ArticleModel.php b/components/com_content/Model/ArticleModel.php
@@ -40,7 +40,7 @@ class ArticleModel extends ItemModel
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		// Load state from the request.
 		$pk = $app->input->getInt('id');
diff --git a/components/com_content/Model/CategoryModel.php b/components/com_content/Model/CategoryModel.php
@@ -114,7 +114,7 @@ public function __construct($config = array())
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 		$pk  = $app->input->getInt('id');
 
 		$this->setState('category.id', $pk);
@@ -282,7 +282,7 @@ public function getItems()
 	 */
 	protected function _buildContentOrderBy()
 	{
-		$app       = \JFactory::getApplication('site');
+		$app       = \JFactory::getApplication();
 		$db        = $this->getDbo();
 		$params    = $this->state->params;
 		$itemid    = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php
@@ -113,7 +113,7 @@ public static function getItemid($query)
 		// Get the menu items for com_finder.
 		if (!$items || !$active)
 		{
-			$app = JFactory::getApplication('site');
+			$app = JFactory::getApplication();
 			$com = JComponentHelper::getComponent('com_finder');
 			$menu = $app->getMenu();
 			$active = $menu->getActive();
diff --git a/components/com_newsfeeds/Model/NewsfeedModel.php b/components/com_newsfeeds/Model/NewsfeedModel.php
@@ -39,7 +39,7 @@ class NewsfeedModel extends ItemModel
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		// Load state from the request.
 		$pk = $app->input->getInt('id');
diff --git a/components/com_tags/Model/TagsModel.php b/components/com_tags/Model/TagsModel.php
@@ -44,7 +44,7 @@ class TagsModel extends ListModel
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$app = \JFactory::getApplication('site');
+		$app = \JFactory::getApplication();
 
 		// Load state from the request.
 		$pid = $app->input->getInt('parent_id');
@@ -115,7 +115,7 @@ public function getItems()
 	 */
 	protected function getListQuery()
 	{
-		$app            = \JFactory::getApplication('site');
+		$app            = \JFactory::getApplication();
 		$user           = \JFactory::getUser();
 		$groups         = implode(',', $user->getAuthorisedViewLevels());
 		$pid            = $this->getState('tag.parent_id');
diff --git a/libraries/src/Component/Router/RouterBase.php b/libraries/src/Component/Router/RouterBase.php
@@ -49,7 +49,7 @@ public function __construct($app = null, $menu = null)
 		}
 		else
 		{
-			$this->app = \JFactory::getApplication('site');
+			$this->app = \JFactory::getApplication();
 		}
 
 		if ($menu)
diff --git a/plugins/installer/folderinstaller/tmpl/default.php b/plugins/installer/folderinstaller/tmpl/default.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 
-$app = Factory::getApplication('administrator');
+$app = Factory::getApplication();
 ?>
 
 <legend><?php echo Text::_('PLG_INSTALLER_FOLDERINSTALLER_TEXT'); ?></legend>

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ public function getContent()`
`484`	`484`
`485`	`485`	`if ($this->getState('compressed'))`
`486`	`486`	`{`
`487`		`- $app = \JFactory::getApplication('administrator');`
	`487`	`+ $app = \JFactory::getApplication();`
`488`	`488`
`489`	`489`	`$files = array(`
`490`	`490`	`'track' => array(`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function getTable($type = 'Category', $prefix = 'Administrator', $config`
`148`	`148`	`*/`
`149`	`149`	`protected function populateState()`
`150`	`150`	`{`
`151`		`- $app = \JFactory::getApplication('administrator');`
	`151`	`+ $app = \JFactory::getApplication();`
`152`	`152`
`153`	`153`	`$parentId = $app->input->getInt('parent_id');`
`154`	`154`	`$this->setState('category.parent_id', $parentId);`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ protected function canEditState($record)`
`834`	`834`	`*/`
`835`	`835`	`protected function populateState()`
`836`	`836`	`{`
`837`		`- $app = \JFactory::getApplication('administrator');`
	`837`	`+ $app = \JFactory::getApplication();`
`838`	`838`
`839`	`839`	`// Load the User state.`
`840`	`840`	`$pk = $app->input->getInt('id');`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class InstallModel extends BaseDatabaseModel`
`48`	`48`	`*/`
`49`	`49`	`protected function populateState()`
`50`	`50`	`{`
`51`		`- $app = \JFactory::getApplication('administrator');`
	`51`	`+ $app = \JFactory::getApplication();`
`52`	`52`
`53`	`53`	`$this->setState('message', $app->getUserState('com_installer.message'));`
`54`	`54`	`$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getTable($name = '', $prefix = '', $options = array())`
`76`	`76`	`*/`
`77`	`77`	`protected function populateState()`
`78`	`78`	`{`
`79`		`- $app = \JFactory::getApplication('administrator');`
	`79`	`+ $app = \JFactory::getApplication();`
`80`	`80`	`$params = ComponentHelper::getParams('com_languages');`
`81`	`81`
`82`	`82`	`// Load the User state.`
Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ protected function getReorderConditions($table)`
`943`	`943`	`*/`
`944`	`944`	`protected function populateState()`
`945`	`945`	`{`
`946`		`- $app = \JFactory::getApplication('administrator');`
	`946`	`+ $app = \JFactory::getApplication();`
`947`	`947`
`948`	`948`	`// Load the User state.`
`949`	`949`	`$pk = $app->input->getInt('id');`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu`
`80`	`80`	`*/`
`81`	`81`	`protected function populateState($ordering = 'a.lft', $direction = 'asc')`
`82`	`82`	`{`
`83`		`- $app = \JFactory::getApplication('administrator');`
	`83`	`+ $app = \JFactory::getApplication();`
`84`	`84`
`85`	`85`	`$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function getTable($type = 'MenuType', $prefix = '\JTable', $config = arra`
`93`	`93`	`*/`
`94`	`94`	`protected function populateState()`
`95`	`95`	`{`
`96`		`- $app = \JFactory::getApplication('administrator');`
	`96`	`+ $app = \JFactory::getApplication();`
`97`	`97`
`98`	`98`	`// Load the User state.`
`99`	`99`	`$id = $app->input->getInt('id');`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)`
`151`	`151`
`152`	`152`	`if (!$menuType)`
`153`	`153`	`{`
`154`		`- $app = JFactory::getApplication('administrator');`
	`154`	`+ $app = JFactory::getApplication();`
`155`	`155`	`$currentMenuType = $app->getUserState('com_menus.items.menutype', '');`
`156`	`156`	`$menuType = $app->input->getString('menutype', $currentMenuType);`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function __construct($config = array())`
`105`	`105`	`*/`
`106`	`106`	`protected function populateState()`
`107`	`107`	`{`
`108`		`- $app = \JFactory::getApplication('administrator');`
	`108`	`+ $app = \JFactory::getApplication();`
`109`	`109`
`110`	`110`	`// Load the User state.`
`111`	`111`	`$pk = $app->input->getInt('id');`