[4.0] Remove quoting from ordering columns (#30312)

* Remove quoting from ordering columns * Remove redundant escaping * Fix ambiguous column names
joomla · Aug 7, 2020 · e5db439 · e5db439
1 parent bc0da36
commit e5db439
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/administrator/components/com_banners/src/Model/BannersModel.php b/administrator/components/com_banners/src/Model/BannersModel.php
@@ -227,7 +227,7 @@ protected function getListQuery()
 				$orderCol = 'cl.name';
 			}
 
-			$ordering = $db->quoteName($db->escape($orderCol)) . ' ' . $db->escape($orderDirn);
+			$ordering = $db->escape($orderCol) . ' ' . $db->escape($orderDirn);
 		}
 
 		$query->order($ordering);

diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -566,7 +566,7 @@ protected function getListQuery()
 		}
 		else
 		{
-			$ordering = $db->quoteName($db->escape($orderCol)) . ' ' . $db->escape($orderDirn);
+			$ordering = $db->escape($orderCol) . ' ' . $db->escape($orderDirn);
 		}
 
 		$query->order($ordering);

diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
@@ -332,7 +332,7 @@ protected function getListQuery()
 		}
 		else
 		{
-			$ordering = $db->quoteName($db->escape($orderCol)) . ' ' . $db->escape($orderDirn);
+			$ordering = $db->escape($orderCol) . ' ' . $db->escape($orderDirn);
 		}
 
 		$query->order($ordering);

diff --git a/administrator/components/com_workflow/src/Model/TransitionsModel.php b/administrator/components/com_workflow/src/Model/TransitionsModel.php
@@ -200,7 +200,7 @@ public function getListQuery()
 		$orderCol	= $this->state->get('list.ordering', 't.id');
 		$orderDirn 	= strtoupper($this->state->get('list.direction', 'ASC'));
 
-		$query->order($db->quoteName($db->escape($orderCol)) . ' ' . $db->escape($orderDirn === 'DESC' ? 'DESC' : 'ASC'));
+		$query->order($db->escape($orderCol) . ' ' . ($orderDirn === 'DESC' ? 'DESC' : 'ASC'));
 
 		return $query;
 	}

diff --git a/administrator/components/com_workflow/src/Model/WorkflowsModel.php b/administrator/components/com_workflow/src/Model/WorkflowsModel.php
@@ -274,7 +274,7 @@ public function getListQuery()
 		$orderCol  = $this->state->get('list.ordering', 'w.ordering');
 		$orderDirn = strtoupper($this->state->get('list.direction', 'ASC'));
 
-		$query->order($db->quoteName($db->escape($orderCol)) . ' ' . $db->escape($orderDirn === 'DESC' ? 'DESC' : 'ASC'));
+		$query->order($db->escape($orderCol) . ' ' . ($orderDirn === 'DESC' ? 'DESC' : 'ASC'));
 
 		return $query;
 	}

diff --git a/administrator/modules/mod_latest/src/Helper/LatestHelper.php b/administrator/modules/mod_latest/src/Helper/LatestHelper.php
@@ -46,13 +46,13 @@ public static function getList(Registry &$params, ArticlesModel $model)
 		switch ($params->get('ordering', 'c_dsc'))
 		{
 			case 'm_dsc':
-				$model->setState('list.ordering', 'modified DESC, created');
+				$model->setState('list.ordering', 'a.modified DESC, a.created');
 				$model->setState('list.direction', 'DESC');
 				break;
 
 			case 'c_dsc':
 			default:
-				$model->setState('list.ordering', 'created');
+				$model->setState('list.ordering', 'a.created');
 				$model->setState('list.direction', 'DESC');
 				break;
 		}