summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-12-05 20:53:11 +0100
committerMorris Jobke <morris.jobke@gmail.com>2013-12-05 20:53:11 +0100
commit9c4bbf9ad7bce25153a54c2b10a5f11cec6fa04e (patch)
tree5fd1573c2cbd8a4c8b083609bc23896e7d885c2c /lib
parentf12363d90b31e03a9f2e95911dda54af728a2df6 (diff)
downloadnextcloud-server-9c4bbf9ad7bce25153a54c2b10a5f11cec6fa04e.tar.gz
nextcloud-server-9c4bbf9ad7bce25153a54c2b10a5f11cec6fa04e.zip
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973.
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php1
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
}