diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-03 08:36:19 -0800 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-03 08:36:19 -0800 |
| commit | 4e1923b01e0ce27499b75f55d9b119f79e2d3fd5 (patch) | |
| tree | 2cf32bf29be26c0938c430692b0992d4768166c1 | |
| parent | b673748151b4e46b03592459f6eea4e250fc473a (diff) | |
| parent | ce443818d4a54c2f1d2d058c5cf2347e470d0d46 (diff) | |
| download | nextcloud-server-4e1923b01e0ce27499b75f55d9b119f79e2d3fd5.tar.gz nextcloud-server-4e1923b01e0ce27499b75f55d9b119f79e2d3fd5.zip | |
Merge pull request #1067 from owncloud/fix-logout
Check if oc_token cookie exists during logout
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 94fb7979620..ef203b33c2b 100644 --- a/lib/base.php +++ b/lib/base.php @@ -557,7 +557,9 @@ class OC OC_App::loadApps(); OC_User::setupBackends(); if (isset($_GET["logout"]) and ($_GET["logout"])) { - OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); + if (isset($_COOKIE['oc_token'])) { + OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']); + } OC_User::logout(); header("Location: " . OC::$WEBROOT . '/'); } else { |