diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:20:00 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 10:22:13 -0400 |
| commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
| tree | a66a930783de938deaa3d2362dcf779e5c2b45af /lib/group/interface.php | |
| parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
| parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) | |
| download | nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.tar.gz nextcloud-server-4c7fd8cd0191871e48704f693f48554d4ee7a726.zip | |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'lib/group/interface.php')
| -rw-r--r-- | lib/group/interface.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/group/interface.php b/lib/group/interface.php index 6e492e72748..12cc07a5374 100644 --- a/lib/group/interface.php +++ b/lib/group/interface.php @@ -58,7 +58,7 @@ interface OC_Group_Interface { * * Returns a list with all groups */ - public function getGroups($search = '', $limit = 10, $offset = 0); + public function getGroups($search = '', $limit = -1, $offset = 0); /** * check if a group exists @@ -71,6 +71,6 @@ interface OC_Group_Interface { * @brief get a list of all users in a group * @returns array with user ids */ - public function usersInGroup($gid); + public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0); }
\ No newline at end of file |