Fix merge conflicts

phpmyadmin · May 28, 2013 · e6b1391 · e6b1391
2 parents 23be8cf + ec6a47d
commit e6b1391
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -22,6 +22,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
@@ -616,14 +616,6 @@ private function _getWarnings()
     {
         $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
@@ -262,14 +262,6 @@ public function auth()
         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
@@ -92,7 +92,8 @@
         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.'
+            . 'installation properly. Also ensure that cookies are enabled '
+            . 'in your browser.'
         );
     }
     unset($orig_error_count);