summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-06 17:37:35 +0100
committerVincent Petry <pvince81@owncloud.com>2013-11-06 17:37:35 +0100
commit99e5c6f7eb58404be2cc5448ec380f29c9a71225 (patch)
tree775cd8f7c43d3b6cf88e9dcb8e05dbd980a1ee90
parentd490b8f97247fdd2382330e9c2be7ac8e0471ca4 (diff)
downloadnextcloud-server-99e5c6f7eb58404be2cc5448ec380f29c9a71225.tar.gz
nextcloud-server-99e5c6f7eb58404be2cc5448ec380f29c9a71225.zip
Now removing stray old cookies from 5.0.12
Cookies from 5.0.12 seemed to have an extra slash in the path. Firefox doesn't allow to remove them if the trailing slash isn't there, thus making it impossible to logout correctly. This fix adds extra code to delete such stray cookies.
-rw-r--r--lib/user.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/user.php b/lib/user.php
index 31be3f20db8..a161868c8c2 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -652,5 +652,10 @@ class OC_User {
setcookie('oc_username', '', time()-3600, \OC::$WEBROOT);
setcookie('oc_token', '', time()-3600, \OC::$WEBROOT);
setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT);
+ // old cookies might be stored under /webroot/ instead of /webroot
+ // and Firefox doesn't like it!
+ setcookie('oc_username', '', time()-3600, \OC::$WEBROOT . '/');
+ setcookie('oc_token', '', time()-3600, \OC::$WEBROOT . '/');
+ setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT . '/');
}
}