summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-07-10 09:08:01 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-07-10 09:08:01 -0700
commite2a5af4b9edb5cc15285c747e739ec1d58220613 (patch)
tree058e060d9b5cf4f840c1f252cc78a595300513e3
parenta9072056a087bda489478ceaa2b374e18b5ff03b (diff)
parent9e9c323acdafa0a454a6a797480ba8e0c088c6c2 (diff)
downloadnextcloud-server-e2a5af4b9edb5cc15285c747e739ec1d58220613.tar.gz
nextcloud-server-e2a5af4b9edb5cc15285c747e739ec1d58220613.zip
Merge pull request #3985 from owncloud/cookie-past2
apply @LukasReschke's cookie changes, hopefully finally fix #854
-rw-r--r--lib/user/session.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/user/session.php b/lib/user/session.php
index cf93d9593af..9a6c669e935 100644
--- a/lib/user/session.php
+++ b/lib/user/session.php
@@ -166,8 +166,8 @@ class Session implements Emitter {
unset($_COOKIE["oc_username"]); //TODO: DI
unset($_COOKIE["oc_token"]);
unset($_COOKIE["oc_remember_login"]);
- setcookie("oc_username", null, -1);
- setcookie("oc_token", null, -1);
- setcookie("oc_remember_login", null, -1);
+ setcookie('oc_username', '', time()-3600, \OC::$WEBROOT);
+ setcookie('oc_token', '', time()-3600, \OC::$WEBROOT);
+ setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT);
}
}