From 8b09402b771fcede0cc5183340729b9c4be654e9 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 4 Mar 2013 12:08:41 -0500 Subject: [PATCH] Fix #2074 by initializing as an array --- lib/group/backend.php | 10 +++++----- lib/group/database.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/group/backend.php b/lib/group/backend.php index e7b7b21d95..26a784efb2 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -142,14 +142,14 @@ abstract class OC_Group_Backend implements OC_Group_Interface { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $users = $this->usersInGroup($gid, $search, $limit, $offset); - foreach ( $users as $user ) { - $DisplayNames[$user] = $user; + foreach ($users as $user) { + $displayNames[$user] = $user; } - return $DisplayNames; + return $displayNames; } } diff --git a/lib/group/database.php b/lib/group/database.php index 40e9b0d414..d0974685ff 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -219,8 +219,8 @@ class OC_Group_Database extends OC_Group_Backend { * @param int $offset * @return array with display names (value) and user ids (key) */ - public function DisplayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { - $displayNames = ''; + public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0) { + $displayNames = array(); $stmt = OC_DB::prepare('SELECT `*PREFIX*users`.`uid`, `*PREFIX*users`.`displayname`' .' FROM `*PREFIX*users`'