diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 14:01:24 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 14:01:24 +0100 |
| commit | 27ad69eea586d30153b4b68328e7b938e7912f60 (patch) | |
| tree | 7f325e50c1fb46a5360f2e5e026b91af97d55ba6 /lib | |
| parent | f19276f7bc5fa74dff749112fffd350dad662148 (diff) | |
| parent | 9f0fc30251fbcf0d2a75f91aa8be606e39297fa4 (diff) | |
| download | nextcloud-server-27ad69eea586d30153b4b68328e7b938e7912f60.tar.gz nextcloud-server-27ad69eea586d30153b4b68328e7b938e7912f60.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 1 | ||||
| -rw-r--r-- | lib/private/user.php | 1 | ||||
| -rw-r--r-- | lib/private/user/session.php | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index b3911094dbf..525d290931f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -328,6 +328,7 @@ class OC { } OC_Util::addStyle("styles"); + OC_Util::addStyle("mobile"); OC_Util::addStyle("icons"); OC_Util::addStyle("apps"); OC_Util::addStyle("fixes"); 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); } diff --git a/lib/private/user/session.php b/lib/private/user/session.php index cd03b30205f..1740bad5abe 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -157,7 +157,6 @@ class Session implements Emitter, \OCP\IUserSession { if($user !== false) { if (!is_null($user)) { if ($user->isEnabled()) { - session_regenerate_id(true); $this->setUser($user); $this->setLoginName($uid); $this->manager->emit('\OC\User', 'postLogin', array($user, $password)); |