From: Joas Schilling <coding@schilljs.com>
Date: Fri, 20 Mar 2020 14:08:21 +0000 (+0100)
Subject: Make sure MySQL is not saying 'this' = 'this ' is true
X-Git-Tag: v19.0.0beta3~7^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F20050%2Fhead;p=nextcloud-server.git

Make sure MySQL is not saying 'this' = 'this ' is true

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
index 899f9277439..3b81f11c4dc 100644
--- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
@@ -52,4 +52,12 @@ class MySqlExpressionBuilder extends ExpressionBuilder {
 		$y = $this->helper->quoteColumnName($y);
 		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
 	}
+
+	public function eq($x, $y, $type = null) {
+		return 'BINARY ' . parent::eq($x, $y, $type);
+	}
+
+	public function neq($x, $y, $type = null) {
+		return 'BINARY ' . parent::neq($x, $y, $type);
+	}
 }
diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index 303050a7716..e55d4395191 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -188,7 +188,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	 */
 	public function userExists($uid) {
 		$user = $this->get($uid);
-		return ($user !== null);
+		return $user !== null && $user->getUID() === $uid;
 	}
 
 	/**