Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp

This commit is contained in:
Arthur Schiwon 2014-05-26 13:56:40 +02:00
commit 3a21c3e2f4

View file

@ -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) {