[Pkg-owncloud-commits] [owncloud] 49/58: :lipstick:

David Prévot taffit at moszumanska.debian.org
Tue Aug 11 15:58:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.6
in repository owncloud.

commit 36f17964e5db0193130b403bdefa29b5c3e0b537
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed Jan 28 23:57:04 2015 +0100

    :lipstick:
---
 apps/user_ldap/group_ldap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 916d5f9..87e4a5c 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -251,7 +251,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	/**
 	 * returns a filter for a "users in primary group" search or count operation
 	 *
-	 * @param $groupDN
+	 * @param string $groupDN
 	 * @param string $search
 	 * @return string
 	 * @throws \Exception
@@ -281,7 +281,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
-	 * @return \string[]
+	 * @return string[]
 	 */
 	public function getUsersInPrimaryGroup($groupDN, $search = '', $limit = -1, $offset = 0) {
 		try {
@@ -300,7 +300,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	/**
 	 * returns the number of users that have the given group as primary group
 	 *
-	 * @param $groupDN
+	 * @param string $groupDN
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
@@ -310,7 +310,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		try {
 			$filter = $this->prepareFilterForUsersInPrimaryGroup($groupDN, $search);
 			$users = $this->access->countUsers($filter, array('dn'), $limit, $offset);
-			return (is_int($users)) ? $users : 0;
+			return (int)$users;
 		} catch (\Exception $e) {
 			return 0;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list