diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-04-16 08:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 08:46:18 +0200 |
| commit | e21d65e771305bfeeb4e2ab0963e1c07eb0c11a7 (patch) | |
| tree | d64ce0cdb12905585237c3a0e7b66666e3ad4a58 /lib | |
| parent | 078ac97939747eec246ed105830d4643b81d994c (diff) | |
| parent | cbcf072b23970790065e0df4a43492e1affa4bf7 (diff) | |
| download | nextcloud-server-e21d65e771305bfeeb4e2ab0963e1c07eb0c11a7.tar.gz nextcloud-server-e21d65e771305bfeeb4e2ab0963e1c07eb0c11a7.zip | |
Merge pull request #20509 from nextcloud/revert-20050-bugfix/noid/mysql-equal-trims-shock
Revert "Make sure MySQL is not saying 'this' = 'this ' is true"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php | 8 | ||||
| -rw-r--r-- | lib/private/User/Manager.php | 2 |
2 files changed, 1 insertions, 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); } /** |