diff options
| -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; |