remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php
index 2e17b5d0b7f9f805b7e5d47572e21d558286f7a0..4604e1cc415059243ebdc811fe5b57788fc7cea0 100644 (file)
--- 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 d5a17f6d2155572f144bd976ac4eecf8cc77307c..851eb5826989a30f23eff32ac4391a5df56635e3 100644 (file)
--- 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) {