diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-03-20 17:08:21 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2020-04-15 10:14:12 +0300 |
| commit | 16e9bf23094a218d01d6b87b22e358473af1e731 (patch) | |
| tree | ea69f1a2a3388b15dc63dcf51bccc2493b905713 /lib | |
| parent | b212151af10bf70e13056921b866e75c397382f0 (diff) | |
Make sure MySQL is not saying 'this' = 'this ' is true
Signed-off-by: Joas Schilling <coding@schilljs.com>
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, 9 insertions, 1 deletions
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; } /** |