Skip to content

Commit

Permalink
Remove quoting from ordering columns
Browse files Browse the repository at this point in the history
  • Loading branch information
SharkyKZ committed Aug 7, 2020
1 parent f0f2732 commit cdbd896
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Expand Up @@ -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);
Expand Down
Expand Up @@ -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);
Expand Down
Expand Up @@ -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);
Expand Down
Expand Up @@ -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) . ' ' . $db->escape($orderDirn === 'DESC' ? 'DESC' : 'ASC'));

return $query;
}
Expand Down
Expand Up @@ -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) . ' ' . $db->escape($orderDirn === 'DESC' ? 'DESC' : 'ASC'));

return $query;
}
Expand Down

0 comments on commit cdbd896

Please sign in to comment.