diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-11 18:28:45 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:08:14 +0100 |
| commit | a7ae2e874a28aed2c190840634db50a19ab1d2e7 (patch) | |
| tree | 1e86370be647a8845bf2ac11c0287def1f3802db /lib/private/group | |
| parent | b5bc37d2e40aba0ab8d3e72e7f7075352839096d (diff) | |
| download | nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.tar.gz nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.zip | |
Squash 'a | b' into 'a|b', in /lib
Diffstat (limited to 'lib/private/group')
| -rw-r--r-- | lib/private/group/database.php | 2 | ||||
| -rw-r--r-- | lib/private/group/dummy.php | 2 | ||||
| -rw-r--r-- | lib/private/group/group.php | 4 | ||||
| -rw-r--r-- | lib/private/group/manager.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/group/database.php b/lib/private/group/database.php index abdf09a9222..18c060e9b22 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -217,7 +217,7 @@ class OC_Group_Database extends OC_Group_Backend { * @param string $search * @param int $limit * @param int $offset - * @return int | false + * @return int|false */ public function countUsersInGroup($gid, $search = '') { $stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?'); diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index 1ef81c6bf99..7a766a6b35d 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -159,7 +159,7 @@ class OC_Group_Dummy extends OC_Group_Backend { /** * @brief get the number of all users in a group - * @return int | bool + * @return int|bool */ public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) { if(isset($this->groups[$gid])) { diff --git a/lib/private/group/group.php b/lib/private/group/group.php index 7593bb68d1a..69641854dc5 100644 --- a/lib/private/group/group.php +++ b/lib/private/group/group.php @@ -26,7 +26,7 @@ class Group { private $usersLoaded; /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backend + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backend */ private $backends; @@ -184,7 +184,7 @@ class Group { * returns the number of users matching the search string * * @param string $search - * @return int | bool + * @return int|bool */ public function count($search) { $users = false; diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 3eb894a644a..f03f7004132 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter; */ class Manager extends PublicEmitter { /** - * @var \OC_Group_Backend[] | \OC_Group_Database[] $backends + * @var \OC_Group_Backend[]|\OC_Group_Database[] $backends */ private $backends = array(); |