From cbcf072b23970790065e0df4a43492e1affa4bf7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@users.noreply.github.com>
Date: Wed, 15 Apr 2020 23:49:16 +0200
Subject: [PATCH] Revert "Make sure MySQL is not saying 'this' = 'this ' is
true"
---
.../ExpressionBuilder/MySqlExpressionBuilder.php | 8 --------
lib/private/User/Manager.php | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
index 3b81f11c4dc..899f9277439 100644
--- a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
@@ -52,12 +52,4 @@ 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 e55d4395191..303050a7716 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 && $user->getUID() === $uid;
+ return ($user !== null);
}
/**
--
GitLab