diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-05-26 13:56:40 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-05-26 13:56:40 +0200 |
| commit | 3a21c3e2f46fd01cbbab237d36a3e8abbbca3cca (patch) | |
| tree | 1010d564412e1567f4f34bc7fbde23d20d301a6b | |
| parent | 4a4ea67a31cda773dc84fb1fd617bfc27f77d5b8 (diff) | |
| parent | c03e7fcfa9419a31cc6d92d40c55532dab9578f3 (diff) | |
| download | nextcloud-server-3a21c3e2f46fd01cbbab237d36a3e8abbbca3cca.tar.gz nextcloud-server-3a21c3e2f46fd01cbbab237d36a3e8abbbca3cca.zip | |
Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp
| -rw-r--r-- | lib/base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 9441749f1dd..6206ebebe93 100644 --- a/lib/base.php +++ b/lib/base.php @@ -886,7 +886,7 @@ class OC { if(OC_User::userExists($_COOKIE['oc_username'])) { self::cleanupLoginTokens($_COOKIE['oc_username']); - // confirm credentials in cookie + // verify whether the supplied "remember me" token was valid $granted = OC_User::loginWithCookie( $_COOKIE['oc_username'], $_COOKIE['oc_token']); if($granted === true) { |