Skip to content

Commit

Permalink
Merge branch '4.0-dev' into patch-129
Browse files Browse the repository at this point in the history
  • Loading branch information
alikon committed Jan 23, 2020
2 parents b8e3788 + f5f840b commit 234913f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ protected function getListQuery()
if ($this->getState('filter.component'))
{
$component = $this->getState('filter.component');
$lcomponent = $component . '%';
$lcomponent = $component . '.%';
$query->where(
'(' . $db->quoteName('a.name') . ' = :component'
. ' OR ' . $db->quoteName('a.name') . ' LIKE :lcomponent)'
Expand Down
12 changes: 4 additions & 8 deletions administrator/components/com_users/Model/DebuguserModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,10 @@ protected function getListQuery()
if ($this->getState('filter.component'))
{
$component = $this->getState('filter.component');
$lcomponent = $component . '%';
$query->extendWhere(
'AND',
[
$db->quoteName('a.name') . ' = :component',
$db->quoteName('a.name') . ' LIKE :lcomponent'
],
'OR'
$lcomponent = $component . '.%';
$query->where(
'(' . $db->quoteName('a.name') . ' = :component'
. ' OR ' . $db->quoteName('a.name') . ' LIKE :lcomponent)'
)
->bind(':component', $component)
->bind(':lcomponent', $lcomponent);
Expand Down

0 comments on commit 234913f

Please sign in to comment.