[Pkg-owncloud-commits] [owncloud] 38/67: LDAP: check if index is set, fix Notices

David Prévot taffit at alioth.debian.org
Fri Nov 8 23:10:39 UTC 2013


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

taffit pushed a commit to annotated tag v4.5.1
in repository owncloud.

commit e8b84145e8c33cbe7bb58487e392b6f5b6c640d7
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Mon Oct 15 17:16:47 2012 +0200

    LDAP: check if index is set, fix Notices
---
 apps/user_ldap/lib/access.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 66007d0..a500e1b 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -339,7 +339,8 @@ abstract class Access {
 		$ownCloudNames = array();
 
 		foreach($ldapObjects as $ldapObject) {
-			$ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers);
+			$nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null;
+			$ocname = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
 			if($ocname) {
 				$ownCloudNames[] = $ocname;
 			}

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