summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-09-25 15:03:22 +0200
committerArthur Schiwon <blizzz@owncloud.com>2013-09-25 15:03:22 +0200
commit1c976a7c9bd27f1fe3f2b1834fd3cbdf5f235bc1 (patch)
tree04009b16b9836fb8cd0ca8723247bae29f2225ad
parent68bfcfbf77ff938fa93b7f80c991c2872b68b157 (diff)
downloadnextcloud-server-1c976a7c9bd27f1fe3f2b1834fd3cbdf5f235bc1.tar.gz
nextcloud-server-1c976a7c9bd27f1fe3f2b1834fd3cbdf5f235bc1.zip
manager checkPassword now returns User object, adjust internal user class accordingly.
-rw-r--r--lib/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user.php b/lib/user.php
index da774ff86f0..b5fd418acd6 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -419,7 +419,7 @@ class OC_User {
$manager = self::getManager();
$username = $manager->checkPassword($uid, $password);
if ($username !== false) {
- return $manager->get($username)->getUID();
+ return $username->getUID();
}
return false;
}