summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-12-05 16:12:46 +0100
committerMorris Jobke <morris.jobke@gmail.com>2013-12-05 16:12:46 +0100
commiteba35d28cd974507f9e81e15430d3d33dbbd9973 (patch)
tree132ba3c9ecf8ee2cc45c4d1c7691671cd02e7758 /lib/base.php
parentcec17fd3e2f53b987d9c51497a5aa9f959710f3c (diff)
downloadnextcloud-server-eba35d28cd974507f9e81e15430d3d33dbbd9973.tar.gz
nextcloud-server-eba35d28cd974507f9e81e15430d3d33dbbd9973.zip
Revert "Fix user's displayName being overwritten by (old) cookie"
This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b.
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index baf73b2fb9f..2feedd81d8c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -866,6 +866,7 @@ 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
}