diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-07 17:14:34 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-07 17:14:34 -0500 |
| commit | 48265643446f71abc1bf903ae822c746d5938865 (patch) | |
| tree | 8a66504c8dd0997a9cc8aa7631eea834667ee20a /lib/group | |
| parent | 4cb5cb9693a2b5d13905079f2ba7c6300c26d9b2 (diff) | |
| parent | 0aa6c1b163c582011f695510b0048e31479eb8a4 (diff) | |
| download | nextcloud-server-48265643446f71abc1bf903ae822c746d5938865.tar.gz nextcloud-server-48265643446f71abc1bf903ae822c746d5938865.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'lib/group')
| -rw-r--r-- | lib/group/backend.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/group/backend.php b/lib/group/backend.php index 26a784efb28..2e17b5d0b7f 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -33,6 +33,7 @@ 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); /** * Abstract base class for user management @@ -43,6 +44,7 @@ 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', ); /** |