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.

diff --git a/lib/user.php b/lib/user.php
index 31be3f20db877cfc5135866fb5aed367140d3a57..a161868c8c29fd16645d8312c8d2c69dc2f74d78 100644 (file)
--- 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 . '/');
        }
 }