mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1768 from houqp/issue_1739 

bug fix for issue 1739
This commit is contained in:
Björn Schießle 2013-02-21 01:09:15 -08:00
parent dcd93a53e4 2c78c5ccab
commit c8c0e72e73
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/group.php
View File

@ -308,15 +308,16 @@ class OC_Group {
* @return array with display names (Key) user ids (value)
*/
public static function displayNamesInGroups($gids, $search = '', $limit = -1, $offset = 0) {
$displayNames = array();
$displayNames = array();
foreach ($gids as $gid) {
// TODO Need to apply limits to groups as total
$displayNames = array_merge(
array_diff(
self::displayNamesInGroup($gid, $search, $limit, $offset),
$displayNames
),
$displayNames);
$diff = array_diff(
self::displayNamesInGroup($gid, $search, $limit, $offset),
$displayNames
);
if ($diff) {
$displayNames = array_merge($diff, $displayNames);
}
}
return $displayNames;
}

2
lib/group/database.php
View File

@ -225,7 +225,7 @@ class OC_Group_Database extends OC_Group_Backend {
$stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`'
.' FROM `*PREFIX*users`'
.' 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,
$offset);
$result = $stmt->execute(array($gid, $search.'%'));