Skip to content
Snippets Groups Projects
Commit 2c78c5cc authored by Qingping Hou's avatar Qingping Hou
Browse files

bug fix for issue 1739, two changes included:

* fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause
* check array_diff return value in OC_Group::displayNamesInGroups,
  when there is no difference between two arrays, it will return
  NULL, so we have to take care of it.
parent c8e02060
Branches
No related tags found
No related merge requests found
...@@ -311,12 +311,13 @@ class OC_Group { ...@@ -311,12 +311,13 @@ class OC_Group {
$displayNames = array(); $displayNames = array();
foreach ($gids as $gid) { foreach ($gids as $gid) {
// TODO Need to apply limits to groups as total // TODO Need to apply limits to groups as total
$displayNames = array_merge( $diff = array_diff(
array_diff(
self::displayNamesInGroup($gid, $search, $limit, $offset), self::displayNamesInGroup($gid, $search, $limit, $offset),
$displayNames $displayNames
), );
$displayNames); if ($diff) {
$displayNames = array_merge($diff, $displayNames);
}
} }
return $displayNames; return $displayNames;
} }
......
...@@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend { ...@@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend {
$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
.' FROM `*PREFIX*users`' .' FROM `*PREFIX*users`'
.' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`' .' INNER JOIN `*PREFIX*group_user` ON `*PREFIX*group_user`.`uid` = `*PREFIX*users`.`uid`'
.' WHERE `gid` = ? AND `*PREFIX*group_user.uid` LIKE ?', .' WHERE `gid` = ? AND `*PREFIX*group_user`.`uid` LIKE ?',
$limit, $limit,
$offset); $offset);
$result = $stmt->execute(array($gid, $search.'%')); $result = $stmt->execute(array($gid, $search.'%'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment