mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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"
This commit is contained in:
Roeland Jago Douma 2020-04-16 08:46:18 +02:00 committed by GitHub
parent 078ac97939 cbcf072b23
commit e21d65e771
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
View File

@ -52,12 +52,4 @@ class MySqlExpressionBuilder extends ExpressionBuilder {
$y = $this->helper->quoteColumnName($y); $y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $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);
}
} }

2
lib/private/User/Manager.php
View File

@ -188,7 +188,7 @@ class Manager extends PublicEmitter implements IUserManager {
*/ */
public function userExists($uid) { public function userExists($uid) {
$user = $this->get($uid); $user = $this->get($uid);
return $user !== null && $user->getUID() === $uid; return ($user !== null);
} }
/** /**