[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5322-g573edc0

[Marc Delisle]

The branch, master has been updated
       via  573edc0329f779dac9ad68dcd8f20ef304f885e5 (commit)
      from  11609bdf80370732b66ba99edecb9febd5d16beb (commit)


- Log -----------------------------------------------------------------
commit 573edc0329f779dac9ad68dcd8f20ef304f885e5
Author: Piotr Przybylski <crackpl at users.sourceforge.net>
Date:   Tue Jul 6 11:43:02 2010 -0400

    patch #3025161 [core] Prevent sending of unnecessary cookies

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    2 ++
 libraries/Config.class.php |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf99259..35c86f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,8 @@ $Id$
 - bug #3004216 [CSS] Field attributes use inline CSS
 - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
 - [core] Update library PHPExcel to version 1.7.3c
+- patch #3025161 [core] Prevent sending of unnecessary cookies, 
+  thanks to Piotr Przybylski  - crackpl
 
 3.3.5.0 (not yet released)
 - patch #2932113 [information_schema] Slow export when having lots of
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index c0090aa..28994c2 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -1086,10 +1086,13 @@ class PMA_Config
         if ($validity == null) {
             $validity = 2592000;
         }
-        if (strlen($value) && null !== $default && $value === $default
-         && isset($_COOKIE[$cookie])) {
-            // remove cookie, default value is used
-            return $this->removeCookie($cookie);
+        if (strlen($value) && null !== $default && $value === $default) {
+            // default value is used
+            if (isset($_COOKIE[$cookie])) {
+                // remove cookie
+                return $this->removeCookie($cookie);
+            }
+            return false;
         }
 
         if (! strlen($value) && isset($_COOKIE[$cookie])) {


hooks/post-receive
-- 
phpMyAdmin