wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11702 from owncloud/fix-11637

Browse source 
setup filesystem by username, not login name, fixes #11637
This commit is contained in:
blizzz 2014-10-22 17:56:30 +02:00
commit 44a7a3690a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/user.php
View file

@ -224,17 +224,18 @@ 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) {
OC_Util::setupFS($uid);
//we need to pass the user name, which may differ from login name
OC_Util::setupFS(self::getUserSession()->getUser()->getUID());
}
return $result;
}