Merge pull request #6199 from nicokaiser/fix-5306-master
Fix user's displayName being overwritten by (old) cookie. #3694
This commit is contained in:
commit
cec17fd3e2
|
@ -866,7 +866,6 @@ class OC {
|
||||||
OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
|
OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
|
||||||
// login
|
// login
|
||||||
OC_User::setUserId($_COOKIE['oc_username']);
|
OC_User::setUserId($_COOKIE['oc_username']);
|
||||||
OC_User::setDisplayName($_COOKIE['oc_username'], $_COOKIE['display_name']);
|
|
||||||
OC_Util::redirectToDefaultPage();
|
OC_Util::redirectToDefaultPage();
|
||||||
// doesn't return
|
// doesn't return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue