Skip to content

Commit e21d65e

Browse files
authored
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"
2 parents 078ac97 + cbcf072 commit e21d65e

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,4 @@ public function iLike($x, $y, $type = null) {
5252
$y = $this->helper->quoteColumnName($y);
5353
return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
5454
}
55-
56-
public function eq($x, $y, $type = null) {
57-
return 'BINARY ' . parent::eq($x, $y, $type);
58-
}
59-
60-
public function neq($x, $y, $type = null) {
61-
return 'BINARY ' . parent::neq($x, $y, $type);
62-
}
6355
}

lib/private/User/Manager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ protected function getUserObject($uid, $backend, $cacheUser = true) {
188188
*/
189189
public function userExists($uid) {
190190
$user = $this->get($uid);
191-
return $user !== null && $user->getUID() === $uid;
191+
return ($user !== null);
192192
}
193193

194194
/**

0 commit comments

Comments
 (0)