summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2013-10-08 23:17:51 +0200
committerAndreas Fischer <bantu@owncloud.com>2013-10-08 23:17:51 +0200
commitfe64f7b900eed4d86eb1d6907d31ecb099989ab7 (patch)
tree0bea7cad2cfb9c78d8fa6c9a7155bfe3da94df3a /lib/private
parent24e99016a924b296685abc290f12d9f533f684d5 (diff)
parent75588fc0b6556d64825e842d4cf62ea572792723 (diff)
downloadnextcloud-server-fe64f7b900eed4d86eb1d6907d31ecb099989ab7.tar.gz
nextcloud-server-fe64f7b900eed4d86eb1d6907d31ecb099989ab7.zip
Merge pull request #5032 from owncloud/fixing-5006-master
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. * owncloud/fixing-5006-master: Use strict comparison === instead of ==. Adjust return value tests for checkPassword() to what OC_User_Example says. Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. Use parent:: in Test_User_Database::getUser(). Test_User_Backend::getUser() does not return an array, it returns a string. Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/user/dummy.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index b5b7a6c3c7a..52be7edfa75 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -88,8 +88,8 @@ class OC_User_Dummy extends OC_User_Backend {
* returns the user id or false
*/
public function checkPassword($uid, $password) {
- if (isset($this->users[$uid])) {
- return ($this->users[$uid] == $password);
+ if (isset($this->users[$uid]) && $this->users[$uid] === $password) {
+ return $uid;
} else {
return false;
}