[Pkg-owncloud-commits] [owncloud] 23/32: trim must not be used in empty in PHP < 5.5

David Prévot taffit at moszumanska.debian.org
Wed Apr 23 18:59:01 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit 72b90816faba41b7bbf22973e826010fa16be257
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Sat Mar 15 10:32:16 2014 +0100

    trim must not be used in empty in PHP < 5.5
---
 lib/private/group/manager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 611af0a..e5d3076 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -176,7 +176,8 @@ class Manager extends PublicEmitter {
 		}
 		// only user backends have the capability to do a complex search for users
 		$groupUsers  = $group->searchUsers('', $limit, $offset);
-		if(!empty(trim($search))) {
+		$search = trim($search);
+		if(!empty($search)) {
 			//TODO: for OC 7 earliest: user backend should get a method to check selected users against a pattern
 			$filteredUsers = $this->userManager->search($search);
 			$testUsers = true;

-- 
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