diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-11-02 18:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 18:32:38 +0100 |
| commit | e6b52ef4cd1a92004895320d52f08b44a8b422d3 (patch) | |
| tree | f83153d562040f0a2c4f4b34abb42acbd1edc0a8 /lib/private/legacy | |
| parent | e81d04cd8d2ac0de3d06d4586550469384c5d91a (diff) | |
| parent | 4da6b20e768574e2ec6a7da590273e18b64ddda5 (diff) | |
| download | nextcloud-server-e6b52ef4cd1a92004895320d52f08b44a8b422d3.tar.gz nextcloud-server-e6b52ef4cd1a92004895320d52f08b44a8b422d3.zip | |
Merge pull request #1347 from nextcloud/bring-back-remember-me
fix remember me login
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/user.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php index af2382dbb86..ed0d14a1ab9 100644 --- a/lib/private/legacy/user.php +++ b/lib/private/legacy/user.php @@ -155,10 +155,11 @@ class OC_User { * @deprecated use \OCP\IUserSession::loginWithCookie() * @param string $uid The username of the user to log in * @param string $token + * @param string $oldSessionId * @return bool */ - public static function loginWithCookie($uid, $token) { - return self::getUserSession()->loginWithCookie($uid, $token); + public static function loginWithCookie($uid, $token, $oldSessionId) { + return self::getUserSession()->loginWithCookie($uid, $token, $oldSessionId); } /** |