Merge pull request #6199 from nicokaiser/fix-5306-master

Fix user's displayName being overwritten by (old) cookie. #3694

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
 			}