summaryrefslogtreecommitdiffstats
path: root/lib/private/User/Session.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/User/Session.php')
-rw-r--r--lib/private/User/Session.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index 3db6cd1a11a..a7d3068ac35 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -287,10 +287,8 @@ class Session implements IUserSession, Emitter {
$this->session->regenerateId();
if ($this->validateToken($password, $uid)) {
return $this->loginWithToken($password);
- } else {
- return $this->loginWithPassword($uid, $password);
}
- return false;
+ return $this->loginWithPassword($uid, $password);
}
/**
@@ -464,7 +462,6 @@ class Session implements IUserSession, Emitter {
$message = \OC::$server->getL10N('lib')->t('User disabled');
throw new LoginException($message);
}
- return false;
}
/**