diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 16:09:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 16:09:33 +0200 |
| commit | fd6b4de2d4bcaebc291610bb1102daedab73644a (patch) | |
| tree | d7a73c227179112cc3c76c6dcf867994eaa21b1e | |
| parent | ac8da41ccd3cea5190d42aebaf46ea8567887133 (diff) | |
| parent | 0f2865abb29e0e910d516703b589c02c792790f6 (diff) | |
| download | nextcloud-server-fd6b4de2d4bcaebc291610bb1102daedab73644a.tar.gz nextcloud-server-fd6b4de2d4bcaebc291610bb1102daedab73644a.zip | |
Merge pull request #18481 from owncloud/fix-apache-login-master
Repeated calls to loginWithApache() should not not try to set user in…
| -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; |