From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Thu, 11 Aug 2016 07:54:36 +0000 (+0200)
Subject: Unreachable statement
X-Git-Tag: v11.0RC2~832^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5aef60d2cad09d40496d92be862afaf02ba94443;p=nextcloud-server.git

Unreachable statement
---

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;
 	}
 
 	/**