From 60edf98c151ad678abe6e9dae292896946a97630 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 14 Mar 2014 13:51:17 +0100 Subject: [PATCH] remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends --- lib/private/group/backend.php | 4 ++-- lib/private/group/group.php | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php index 2e17b5d0b7f..4604e1cc415 100644 --- a/lib/private/group/backend.php +++ b/lib/private/group/backend.php @@ -33,7 +33,8 @@ define('OC_GROUP_BACKEND_CREATE_GROUP', 0x00000001); define('OC_GROUP_BACKEND_DELETE_GROUP', 0x00000010); define('OC_GROUP_BACKEND_ADD_TO_GROUP', 0x00000100); define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP', 0x00001000); -define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); +// deprecated, do not use 0x00010000 for new features though. +// define('OC_GROUP_BACKEND_GET_DISPLAYNAME', 0x00010000); /** * Abstract base class for user management @@ -44,7 +45,6 @@ abstract class OC_Group_Backend implements OC_Group_Interface { OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup', OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup', OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup', - OC_GROUP_BACKEND_GET_DISPLAYNAME => 'displayNamesInGroup', ); /** diff --git a/lib/private/group/group.php b/lib/private/group/group.php index d5a17f6d215..851eb582698 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -180,10 +180,7 @@ class Group { */ public function searchDisplayName($search, $limit = null, $offset = null) { foreach ($this->backends as $backend) { - if ($backend->implementsActions(OC_GROUP_BACKEND_GET_DISPLAYNAME)) { - $userIds = array_keys($backend->displayNamesInGroup($this->gid, $search, $limit, $offset)); - } else { - $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); + $userIds = $backend->usersInGroup($this->gid, $search, $limit, $offset); } $users = $this->getVerifiedUsers($userIds); if (!is_null($limit) and $limit <= 0) { -- 2.39.5