diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-08-21 17:31:58 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 11:55:41 +0200 |
| commit | 0f2865abb29e0e910d516703b589c02c792790f6 (patch) | |
| tree | e4b33601452f3b33f21e77c23c65d26139017512 | |
| parent | 6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff) | |
| download | nextcloud-server-0f2865abb29e0e910d516703b589c02c792790f6.tar.gz nextcloud-server-0f2865abb29e0e910d516703b589c02c792790f6.zip | |
Repeated calls to loginWithApache() should not not try to set user information in the session again
| -rw-r--r-- | lib/private/user.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 92807246144..e70734ece40 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -277,11 +277,13 @@ class OC_User { OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid)); if ($uid) { - self::setUserId($uid); - self::setDisplayName($uid); - self::getUserSession()->setLoginName($uid); + if (self::getUser() !== $uid) { + self::setUserId($uid); + self::setDisplayName($uid); + self::getUserSession()->setLoginName($uid); - OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => '')); + OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => '')); + } return true; } return false; |