aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/user.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-02-20 16:55:18 +0100
committerRobin Appelman <icewind@owncloud.com>2014-02-20 16:55:18 +0100
commit0624476aa19a63b1f4e35f35e151c3fc46cb697f (patch)
tree67e9ead3bfd44e7efe3f4a6d1325866075dbd702 /lib/private/user.php
parentf33d35cd073addb08c78a65b719c72eb5424434a (diff)
parentec45a3c0e2567c89729bc6fe8c996b7939025429 (diff)
downloadnextcloud-server-0624476aa19a63b1f4e35f35e151c3fc46cb697f.tar.gz
nextcloud-server-0624476aa19a63b1f4e35f35e151c3fc46cb697f.zip
Merge branch 'master' into mimeicons-svg
Diffstat (limited to 'lib/private/user.php')
-rw-r--r--lib/private/user.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/private/user.php b/lib/private/user.php
index 86a01f96258..08ead712028 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -246,7 +246,6 @@ class OC_User {
OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
if($uid) {
- session_regenerate_id(true);
self::setUserId($uid);
self::setDisplayName($uid);
self::getUserSession()->setLoginName($uid);