From 6ed8175b45ece61d41c705bd5abe4ba1ee3b43e5 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Jun 2006 12:39:53 +0000
Subject: [PATCH] only show the Cookies message if we detect that cookies are
 disabled

---
 ChangeLog                          | 4 ++++
 libraries/auth/cookie.auth.lib.php | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ecc8ec037..553dd28a0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-06-02 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/auth/cookie.auth.lib.php: for auth_type='cookie', avoid
+      showing the "cookies must be enabled" message if they are enabled
+
 2006-05-31 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1498108, support twice the separator
       in db name, thanks to Sylvain Derosiaux
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 9793bfd63..b8c92d3f2 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -212,9 +212,12 @@ echo sprintf( $GLOBALS['strWelcome'],
     </fieldset>
 </form>
 
-<div class="notice"><?php echo $GLOBALS['strCookiesRequired']; ?></div>
-
 <?php
+// show the "Cookies required" message only if cookies are disabled
+// (we previously tried to set some cookies)
+if (empty($_COOKIE)) {
+    echo '<div class="notice">' . $GLOBALS['strCookiesRequired'] . '</div>' . "\n";
+}
 if ( ! empty( $GLOBALS['PMA_errors'] ) && is_array( $GLOBALS['PMA_errors'] ) ) {
     foreach ( $GLOBALS['PMA_errors'] as $error ) {
         echo '<div class="error">' . $error . '</div>' . "\n";