From eba35d28cd974507f9e81e15430d3d33dbbd9973 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 5 Dec 2013 16:12:46 +0100 Subject: [PATCH] Revert "Fix user's displayName being overwritten by (old) cookie" This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b. --- lib/base.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/base.php b/lib/base.php index baf73b2fb9..2feedd81d8 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 }