Lets see if we can get this cookie thing right this time.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4278 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/global.php b/functions/global.php
index 6ee6f9faf1f8c06d62cde4f81b0d8fc4b7043a12..5221b44ec909ea1bee7f608472e917b200a94474 100644 (file)
--- a/functions/global.php
+++ b/functions/global.php
@@ -158,11 +158,10 @@ function sqsession_destroy() {
      */
 
     global $base_uri;
-    $cookie_params = session_get_cookie_params();
-    setcookie(session_name(), '', time() - 5, $cookie_params['path'],
-        $cookie_params['domain']);
-    setcookie('username','',time() - 5,$base_uri);
-    setcookie('key','',time() - 5,$base_uri);
+
+    if (isset($_COOKIE[session_name()])) setcookie(session_name(), '', time() - 5, $base_uri);
+    if (isset($_COOKIE['username'])) setcookie('username','',time() - 5,$base_uri);
+    if (isset($_COOKIE['key'])) setcookie('key','',time() - 5,$base_uri);
 
     $sessid = session_id();
     if (!empty( $sessid )) {