Merge branch '4.0-dev' into multilangstatus_display

joomla · Feb 1, 2018 · 465f17d · 465f17d
2 parents 8dd93a7 + f431605
commit 465f17d
Show file tree

Hide file tree

Showing 262 changed files with 1,099 additions and 792 deletions.
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/administrator/templates/atum/css/bootstrap.min.css b/administrator/templates/atum/css/bootstrap.min.css
diff --git a/administrator/templates/atum/css/template-rtl.min.css b/administrator/templates/atum/css/template-rtl.min.css
diff --git a/administrator/templates/atum/css/template.min.css b/administrator/templates/atum/css/template.min.css
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/libraries/src/Factory.php b/libraries/src/Factory.php
@@ -746,7 +746,7 @@ protected static function createDocument()
 	 * @see     \JStream
 	 * @since   11.1
 	 */
-	public static function getStream($use_prefix = true, $use_network = true, $ua = null, $uamask = false)
+	public static function getStream($use_prefix = true, $use_network = true, $ua = 'Joomla', $uamask = false)
 	{
 		\JLoader::import('joomla.filesystem.stream');