Fix #2074 by initializing as an array
This commit is contained in:
parent
8c8423e766
commit
8b09402b77
|
@ -142,14 +142,14 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
|
||||||
* @param int $offset
|
* @param int $offset
|
||||||
* @return array with display names (value) and user ids (key)
|
* @return array with display names (value) and user ids (key)
|
||||||
*/
|
*/
|
||||||
public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
||||||
$displayNames = '';
|
$displayNames = array();
|
||||||
$users = $this->usersInGroup($gid, $search, $limit, $offset);
|
$users = $this->usersInGroup($gid, $search, $limit, $offset);
|
||||||
foreach ( $users as $user ) {
|
foreach ($users as $user) {
|
||||||
$DisplayNames[$user] = $user;
|
$displayNames[$user] = $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $DisplayNames;
|
return $displayNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -219,8 +219,8 @@ class OC_Group_Database extends OC_Group_Backend {
|
||||||
* @param int $offset
|
* @param int $offset
|
||||||
* @return array with display names (value) and user ids (key)
|
* @return array with display names (value) and user ids (key)
|
||||||
*/
|
*/
|
||||||
public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
||||||
$displayNames = '';
|
$displayNames = array();
|
||||||
|
|
||||||
$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`'
|
||||||
|
|
Loading…
Reference in New Issue