From ec6a47d8a034608efc737499a371a993f7925faa Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 28 May 2013 08:46:04 -0400
Subject: [PATCH] bug #3957 Cookies must be enabled past this point

---
 ChangeLog                                             | 1 +
 libraries/Header.class.php                            | 8 --------
 libraries/plugins/auth/AuthenticationCookie.class.php | 8 --------
 libraries/session.inc.php                             | 2 +-
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dfd3fc22c..9483873d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3927 List of tables is missing after expanding in the navigation frame
 - bug #3942 Warnings about reserved word for many non reserved words
 - bug #3912 Exporting row selection, resulted by ORDER BY query
+- bug #3957 Cookies must be enabled past this point
 
 4.0.2.0 (2013-05-24)
 - bug #3902 Cannot browse when table name contains keyword "call"
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
index 63c852a13f..877d6caa60 100644
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@@ -613,14 +613,6 @@ class PMA_Header
     {
         $retval = '';
         if ($this->_warningsEnabled) {
-            // message of "Cookies required" displayed for auth_type http or config
-            // note: here, the decoration won't work because without cookies,
-            // our standard CSS is not operational
-            if (empty($_COOKIE)) {
-                $retval .= PMA_Message::notice(
-                    __('Cookies must be enabled past this point.')
-                )->getDisplay();
-            }
             $retval .= "<noscript>";
             $retval .= PMA_message::error(
                 __("Javascript must be enabled past this point")
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index a6037aa29e..72274d9e31 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -262,14 +262,6 @@ class AuthenticationCookie extends AuthenticationPlugin
         Swekey_login('input_username', 'input_go');
         // END Swekey Integration
 
-        // show the "Cookies required" message only if cookies are disabled
-        // (we previously tried to set some cookies)
-        if (empty($_COOKIE)) {
-            trigger_error(
-                __('Cookies must be enabled past this point.'),
-                E_USER_NOTICE
-            );
-        }
         if ($GLOBALS['error_handler']->hasDisplayErrors()) {
             echo '<div>';
             $GLOBALS['error_handler']->dispErrors();
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index f873b17f94..b500be66d0 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -89,7 +89,7 @@ if (! isset($_COOKIE[$session_name])) {
          * Session initialization is done before selecting language, so we
          * can not use translations here.
          */
-        PMA_fatalError('Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.');
+        PMA_fatalError('Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly. Also ensure that cookies are enabled in your browser.');
     }
     unset($orig_error_count);
 } else {