Merge pull request #20509 from nextcloud/revert-20050-bugfix/noid/mys…

…ql-equal-trims-shock Revert "Make sure MySQL is not saying 'this' = 'this ' is true"
nextcloud · Apr 16, 2020 · e21d65e · e21d65e
2 parents 078ac97 + cbcf072
commit e21d65e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
@@ -52,12 +52,4 @@ public function iLike($x, $y, $type = null) {
 		$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
@@ -188,7 +188,7 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
 	 */
 	public function userExists($uid) {
 		$user = $this->get($uid);
-		return $user !== null && $user->getUID() === $uid;
+		return ($user !== null);
 	}
 
 	/**