From e0342db47cc95a1032086a82650d2bdc7814ae57 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 22 Oct 2014 13:28:08 +0200 Subject: set up FS by username, not login name\! --- lib/private/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/user.php b/lib/private/user.php index 641a329b0dd..e02a0aaa1fc 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -234,7 +234,7 @@ class OC_User { session_regenerate_id(true); $result = self::getUserSession()->login($uid, $password); if ($result) { - OC_Util::setupFS($uid); + OC_Util::setupFS(self::getUserSession()->getUser()->getUID()); } return $result; } -- cgit v1.2.3 From 993376fb6f62772554e0f35b04f52468021a6cab Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 22 Oct 2014 13:36:57 +0200 Subject: better variable name --- lib/private/user.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/private/user.php b/lib/private/user.php index e02a0aaa1fc..3c23c19b015 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -224,16 +224,17 @@ class OC_User { /** * Try to login a user - * @param string $uid The username of the user to log in + * @param string $loginname The login name of the user to log in * @param string $password The password of the user * @return boolean|null * * Log in a user and regenerate a new session - if the password is ok */ - public static function login($uid, $password) { + public static function login($loginname, $password) { session_regenerate_id(true); - $result = self::getUserSession()->login($uid, $password); + $result = self::getUserSession()->login($loginname, $password); if ($result) { + //we need to pass the user name, which may differ from login name OC_Util::setupFS(self::getUserSession()->getUser()->getUID()); } return $result; -- cgit v1.2.3