Merge branch 'QA_4_6'

phpmyadmin · Dec 19, 2016 · 3a7eaf8 · 3a7eaf8
2 parents 945e615 + 2557709
commit 3a7eaf8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/libraries/Util.php b/libraries/Util.php
@@ -2030,7 +2030,7 @@ public static function checkParameters($params, $request = true)
             }
         }
         if ($found_error) {
-            PMA_fatalError($error_message, null, false);
+            PMA_fatalError($error_message);
         }
     } // end function
 

diff --git a/libraries/core.lib.php b/libraries/core.lib.php
@@ -210,13 +210,10 @@ function PMA_securePath($path)
  *
  * @param string       $error_message  the error message or named error message
  * @param string|array $message_args   arguments applied to $error_message
- * @param boolean      $delete_session whether to delete session cookie
  *
  * @return void
  */
-function PMA_fatalError(
-    $error_message, $message_args = null, $delete_session = true
-) {
+function PMA_fatalError($error_message, $message_args = null) {
     /* Use format string if applicable */
     if (is_string($message_args)) {
         $error_message = sprintf($error_message, $message_args);
@@ -250,14 +247,6 @@ function PMA_fatalError(
         $lang = isset($GLOBALS['lang']) ? $GLOBALS['lang'] : 'en';
         $dir = isset($GLOBALS['text_dir']) ? $GLOBALS['text_dir'] : 'ltr';
 
-        // on fatal errors it cannot hurt to always delete the current session
-        if ($delete_session
-            && isset($GLOBALS['session_name'])
-            && isset($_COOKIE[$GLOBALS['session_name']])
-        ) {
-            $GLOBALS['PMA_Config']->removeCookie($GLOBALS['session_name']);
-        }
-
         // Displays the error message
         include './libraries/error.inc.php';
     }