Joomla 3.9.10 merge

administrator/components/com_actionlogs/Field/LogcreatorField.php

@@ -58,12 +58,12 @@ protected function getOptions()
 			// Construct the query
 			$query = $db->getQuery(true)
 				->select($db->quoteName('u.id', 'value'))
-				->select($db->quoteName('u.name', 'text'))
+				->select($db->quoteName('u.username', 'text'))
 				->from($db->quoteName('#__users', 'u'))
 				->join('INNER', $db->quoteName('#__action_logs', 'c') . ' ON ' . $db->quoteName('c.user_id') . ' = ' . $db->quoteName('u.id'))
 				->group($db->quoteName('u.id'))
-				->group($db->quoteName('u.name'))
-				->order($db->quoteName('u.name'));
+				->group($db->quoteName('u.username'))
+				->order($db->quoteName('u.username'));
 
 			// Setup the query
 			$db->setQuery($query);

administrator/components/com_admin/Model/SysinfoModel.php

@@ -530,7 +530,7 @@ public function getDirectory($public = false)
 
 		foreach ($admin_langs as $folder)
 		{
-			if (!$folder->isDir() || $folder->isDot())
+			if ($folder->isDot() || !$folder->isDir())
 			{
 				continue;
 			}
@@ -546,7 +546,7 @@ public function getDirectory($public = false)
 
 		foreach ($manifests as $folder)
 		{
-			if (!$folder->isDir() || $folder->isDot())
+			if ($folder->isDot() || !$folder->isDir())
 			{
 				continue;
 			}
@@ -569,7 +569,7 @@ public function getDirectory($public = false)
 
 		foreach ($image_folders as $folder)
 		{
-			if (!$folder->isDir() || $folder->isDot())
+			if ($folder->isDot() || !$folder->isDir())
 			{
 				continue;
 			}
@@ -587,7 +587,7 @@ public function getDirectory($public = false)
 
 		foreach ($site_langs as $folder)
 		{
-			if (!$folder->isDir() || $folder->isDot())
+			if ($folder->isDot() || !$folder->isDir())
 			{
 				continue;
 			}
@@ -605,7 +605,7 @@ public function getDirectory($public = false)
 
 		foreach ($plugin_groups as $folder)
 		{
-			if (!$folder->isDir() || $folder->isDot())
+			if ($folder->isDot() || !$folder->isDir())
 			{
 				continue;
 			}

administrator/components/com_admin/sql/updates/mysql/3.9.10-2019-07-09.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__template_styles` MODIFY `home` char(7) NOT NULL DEFAULT '0';

administrator/components/com_admin/sql/updates/mysql/3.9.8-2019-06-15.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `#__template_styles` DROP INDEX `idx_home`;
+# Query removed, see https://github.com/joomla/joomla-cms/pull/25484
+ALTER TABLE `#__template_styles` ADD INDEX `idx_client_id` (`client_id`);
+ALTER TABLE `#__template_styles` ADD INDEX `idx_client_id_home` (`client_id`, `home`);

administrator/components/com_admin/sql/updates/postgresql/3.9.10-2019-07-09.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "#__template_styles" ALTER COLUMN "home" TYPE character varying(7);
+ALTER TABLE "#__template_styles" ALTER COLUMN "home" SET DEFAULT '0';

administrator/components/com_admin/sql/updates/postgresql/3.9.8-2019-06-15.sql

@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS "#__template_styles_idx_home";
+# Queries removed, see https://github.com/joomla/joomla-cms/pull/25484
+CREATE INDEX "#__template_styles_idx_client_id" ON "#__template_styles" ("client_id");
+CREATE INDEX "#__template_styles_idx_client_id_home" ON "#__template_styles" ("client_id", "home");

administrator/components/com_banners/Model/BannerModel.php

@@ -115,20 +115,17 @@ protected function batchClient($value, $pks, $contexts)
 	 */
 	protected function canDelete($record)
 	{
-		if (!empty($record->id))
+		if (empty($record->id) || $record->state != -2)
 		{
-			if ($record->state != -2)
-			{
-				return false;
-			}
-
-			if (!empty($record->catid))
-			{
-				return Factory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
-			}
+			return false;
+		}
 
-			return parent::canDelete($record);
+		if (!empty($record->catid))
+		{
+			return Factory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
 		}
+
+		return parent::canDelete($record);
 	}
 
 	/**

administrator/components/com_banners/Model/ClientModel.php

@@ -41,22 +41,17 @@ class ClientModel extends AdminModel
 	 */
 	protected function canDelete($record)
 	{
-		if (!empty($record->id))
+		if (empty($record->id) || $record->state != -2)
 		{
-			if ($record->state != -2)
-			{
-				return false;
-			}
-
-			$user = Factory::getUser();
-
-			if (!empty($record->catid))
-			{
-				return $user->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
-			}
+			return false;
+		}
 
-			return $user->authorise('core.delete', 'com_banners');
+		if (!empty($record->catid))
+		{
+			return Factory::getUser()->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
 		}
+
+		return parent::canDelete($record);
 	}
 
 	/**

administrator/components/com_contact/Model/ContactModel.php

@@ -120,15 +120,12 @@ protected function batchUser($value, $pks, $contexts)
 	 */
 	protected function canDelete($record)
 	{
-		if (!empty($record->id))
+		if (empty($record->id) || $record->published != -2)
 		{
-			if ($record->published != -2)
-			{
-				return false;
-			}
-
-			return Factory::getUser()->authorise('core.delete', 'com_contact.category.' . (int) $record->catid);
+			return false;
 		}
+
+		return Factory::getUser()->authorise('core.delete', 'com_contact.category.' . (int) $record->catid);
 	}
 
 	/**
@@ -520,35 +517,6 @@ public function featured($pks, $value = 0)
 		return true;
 	}
 
-	/**
-	 * Method to change the title & alias.
-	 *
-	 * @param   integer  $category_id  The id of the parent.
-	 * @param   string   $alias        The alias.
-	 * @param   string   $name         The title.
-	 *
-	 * @return  array  Contains the modified title and alias.
-	 *
-	 * @since   3.1
-	 */
-	protected function generateNewTitle($category_id, $alias, $name)
-	{
-		// Alter the title & alias
-		$table = $this->getTable();
-
-		while ($table->load(array('alias' => $alias, 'catid' => $category_id)))
-		{
-			if ($name == $table->name)
-			{
-				$name = StringHelper::increment($name);
-			}
-
-			$alias = StringHelper::increment($alias, 'dash');
-		}
-
-		return array($name, $alias);
-	}
-
 	/**
 	 * Is the user allowed to create an on the fly category?
 	 *

administrator/components/com_contact/Table/ContactTable.php

@@ -55,6 +55,8 @@ public function __construct(DatabaseDriver $db)
 		$this->typeAlias = 'com_contact.contact';
 
 		parent::__construct('#__contact_details', 'id', $db);
+
+		$this->setColumnAlias('title', 'name');
 	}
 
 	/**

administrator/components/com_content/Model/ArticleModel.php

@@ -272,7 +272,7 @@ protected function canDelete($record)
 	{
 		if (!empty($record->id))
 		{
-			$stage = new StageTable($this->_db);
+			$stage = new StageTable($this->getDbo());
 
 			$workflow = new Workflow(['extension' => 'com_content']);
 

administrator/components/com_content/Model/ArticlesModel.php

@@ -495,6 +495,11 @@ protected function getListQuery()
 		$orderCol  = $this->state->get('list.ordering', 'a.id');
 		$orderDirn = $this->state->get('list.direction', 'DESC');
 
+		if ($orderCol == 'a.ordering' || $orderCol == 'category_title')
+		{
+			$orderCol = $db->quoteName('c.title') . ' ' . $orderDirn . ', ' . $db->quoteName('a.ordering');
+		}
+
 		$query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
 
 		return $query;

administrator/components/com_fields/Model/FieldModel.php

@@ -762,19 +762,14 @@ public function cleanupValues($context, $itemId)
 	 */
 	protected function canDelete($record)
 	{
-		if (!empty($record->id))
+		if (empty($record->id) || $record->state != -2)
 		{
-			if ($record->state != -2)
-			{
-				return false;
-			}
-
-			$parts = FieldsHelper::extract($record->context);
-
-			return Factory::getUser()->authorise('core.delete', $parts[0] . '.field.' . (int) $record->id);
+			return false;
 		}
 
-		return false;
+		$parts = FieldsHelper::extract($record->context);
+
+		return Factory::getUser()->authorise('core.delete', $parts[0] . '.field.' . (int) $record->id);
 	}
 
 	/**

administrator/components/com_installer/Model/InstallerModel.php

@@ -124,10 +124,10 @@ protected function _getList($query, $limitstart = 0, $limit = 0)
 			$total = count($result);
 			$this->cache[$this->getStoreId('getTotal')] = $total;
 
-			if ($total < $limitstart)
+			if ($total <= $limitstart)
 			{
 				$limitstart = 0;
-				$this->setState('list.start', 0);
+				$this->setState('list.limitstart', 0);
 			}
 
 			return array_slice($result, $limitstart, $limit ?: null);

administrator/components/com_menus/Controller/ItemController.php

@@ -365,7 +365,7 @@ public function save($key = null, $urlVar = null)
 		$data = $model->validate($form, $data);
 
 		// Preprocess request fields to ensure that we remove not set or empty request params
-		$request = $form->getGroup('request');
+		$request = $form->getGroup('request', true);
 
 		// Check for the special 'request' entry.
 		if ($data['type'] == 'component' && !empty($request))

administrator/components/com_menus/Model/ItemModel.php

@@ -103,27 +103,19 @@ class ItemModel extends AdminModel
 	 */
 	protected function canDelete($record)
 	{
-		$user = Factory::getUser();
-
-		if (!empty($record->id))
+		if (empty($record->id) || $record->published != -2)
 		{
-			// Only delete trashed items
-			if ($record->published != -2)
-			{
-				return false;
-			}
-
-			$menuTypeId = 0;
+			return false;
+		}
 
-			if (!empty($record->menutype))
-			{
-				$menuTypeId = $this->getMenuTypeId($record->menutype);
-			}
+		$menuTypeId = 0;
 
-			return $user->authorise('core.delete', 'com_menus.menu.' . (int) $menuTypeId);
+		if (!empty($record->menutype))
+		{
+			$menuTypeId = $this->getMenuTypeId($record->menutype);
 		}
 
-		return false;
+		return Factory::getUser()->authorise('core.delete', 'com_menus.menu.' . (int) $menuTypeId);
 	}
 
 	/**

administrator/components/com_modules/Model/ModuleModel.php

@@ -316,18 +316,14 @@ protected function batchMove($value, $pks, $contexts)
 	 */
 	protected function canEditState($record)
 	{
-		$user = Factory::getUser();
-
 		// Check for existing module.
 		if (!empty($record->id))
 		{
-			return $user->authorise('core.edit.state', 'com_modules.module.' . (int) $record->id);
+			return Factory::getUser()->authorise('core.edit.state', 'com_modules.module.' . (int) $record->id);
 		}
+
 		// Default to component settings if module not known.
-		else
-		{
-			return parent::canEditState('com_modules');
-		}
+		return parent::canEditState($record);
 	}
 
 	/**