diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-28 14:54:10 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-28 14:54:10 +0100 |
| commit | 15d1df055b093ecce0c5ae52561dd73584145c7c (patch) | |
| tree | 4f2b10bacfa5371e3f2a53122a3165bf94114d01 /lib/private/user.php | |
| parent | 65843e245996c9ecfd167be2b520bb917b32aa7e (diff) | |
| parent | dd32091016481b0b6845e03ea87ce419b3cda19e (diff) | |
| download | nextcloud-server-15d1df055b093ecce0c5ae52561dd73584145c7c.tar.gz nextcloud-server-15d1df055b093ecce0c5ae52561dd73584145c7c.zip | |
Merge branch 'master' into display-share-owner-master
Conflicts:
apps/files_sharing/lib/cache.php
Diffstat (limited to 'lib/private/user.php')
| -rw-r--r-- | lib/private/user.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 08ead712028..a89b7286c10 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -227,6 +227,7 @@ class OC_User { * Log in a user and regenerate a new session - if the password is ok */ public static function login($uid, $password) { + session_regenerate_id(true); return self::getUserSession()->login($uid, $password); } |