From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Fri, 17 Feb 2017 01:06:10 +0000 (+0100)
Subject: Fix determining the UUID attribute, default of the override is null
X-Git-Tag: v12.0.0beta1~532^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f87812fdd658c94c921c537d59eae3d2e424fff6;p=nextcloud-server.git

Fix determining the UUID attribute, default of the override is null

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index 9e93ef2ecaa..cc0446ae523 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -1473,7 +1473,7 @@ class Access extends LDAPUtility implements IUserTools {
 			return true;
 		}
 
-		if ($uuidOverride !== '' && !$force) {
+		if (is_string($uuidOverride) && trim($uuidOverride) !== '' && !$force) {
 			$this->connection->$uuidAttr = $uuidOverride;
 			return true;
 		}