diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-12-05 06:32:20 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-12-05 06:32:20 -0800 |
| commit | cec17fd3e2f53b987d9c51497a5aa9f959710f3c (patch) | |
| tree | b02b734ca1d2eba16350f1c7c2b4447995834ff5 /lib | |
| parent | f2f44bd09262eb648df7141034c1d39ed8c46a46 (diff) | |
| parent | 2a7380cc21e56ce12b1a0e1460fabc978a83090b (diff) | |
| download | nextcloud-server-cec17fd3e2f53b987d9c51497a5aa9f959710f3c.tar.gz nextcloud-server-cec17fd3e2f53b987d9c51497a5aa9f959710f3c.zip | |
Merge pull request #6199 from nicokaiser/fix-5306-master
Fix user's displayName being overwritten by (old) cookie. #3694
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 2feedd81d8c..baf73b2fb9f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -866,7 +866,6 @@ class OC { OC_User::setMagicInCookie($_COOKIE['oc_username'], $token); // login OC_User::setUserId($_COOKIE['oc_username']); - OC_User::setDisplayName($_COOKIE['oc_username'], $_COOKIE['display_name']); OC_Util::redirectToDefaultPage(); // doesn't return } |