Merge pull request #1067 from owncloud/fix-logout

Check if oc_token cookie exists during logout

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 {