diff -Nur phpMyAdmin-3.3.7-all-languages.orig/error.php phpMyAdmin-3.3.7-all-languages/error.php
--- phpMyAdmin-3.3.7-all-languages.orig/error.php 2010-09-07 18:35:56.000000000 +0200
+++ phpMyAdmin-3.3.7-all-languages/error.php 1970-01-01 01:00:00.000000000 +0100
@@ -1,90 +0,0 @@
-
-
-
-
-
-
- phpMyAdmin
-
-
-
-
-phpMyAdmin -
-
-
-
diff -Nur phpMyAdmin-3.3.7-all-languages.orig/libraries/common.inc.php phpMyAdmin-3.3.7-all-languages/libraries/common.inc.php
--- phpMyAdmin-3.3.7-all-languages.orig/libraries/common.inc.php 2010-09-07 18:35:56.000000000 +0200
+++ phpMyAdmin-3.3.7-all-languages/libraries/common.inc.php 2010-12-30 17:42:47.000000000 +0100
@@ -325,7 +325,6 @@
'db_printview.php',
'db_search.php',
//'Documentation.html',
- //'error.php',
'export.php',
'import.php',
//'index.php',
diff -Nur phpMyAdmin-3.3.7-all-languages.orig/libraries/core.lib.php phpMyAdmin-3.3.7-all-languages/libraries/core.lib.php
--- phpMyAdmin-3.3.7-all-languages.orig/libraries/core.lib.php 2010-09-07 18:35:56.000000000 +0200
+++ phpMyAdmin-3.3.7-all-languages/libraries/core.lib.php 2010-12-30 17:43:59.000000000 +0100
@@ -261,21 +261,18 @@
$error_message = strtr($error_message, array('
' => '[br]'));
// Displays the error message
- // (do not use & for parameters sent by header)
- $query_params = array(
- 'lang' => $GLOBALS['available_languages'][$GLOBALS['lang']][2],
- 'dir' => $GLOBALS['text_dir'],
- 'type' => $GLOBALS['strError'],
- 'error' => $error_message,
- );
- header('Location: ' . (defined('PMA_SETUP') ? '../' : '') . 'error.php?'
- . http_build_query($query_params, null, '&'));
+ $lang = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
+ $dir = $GLOBALS['text_dir'];
+ $type = $error_header;
+ $error = $error_message;
// on fatal errors it cannot hurt to always delete the current session
if (isset($GLOBALS['session_name']) && isset($_COOKIE[$GLOBALS['session_name']])) {
PMA_removeCookie($GLOBALS['session_name']);
}
+ require('./libraries/error.inc.php');
+
exit;
}
diff -Nur phpMyAdmin-3.3.7-all-languages.orig/libraries/error.inc.php phpMyAdmin-3.3.7-all-languages/libraries/error.inc.php
--- phpMyAdmin-3.3.7-all-languages.orig/libraries/error.inc.php 1970-01-01 01:00:00.000000000 +0100
+++ phpMyAdmin-3.3.7-all-languages/libraries/error.inc.php 2010-12-30 17:42:47.000000000 +0100
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+ phpMyAdmin
+
+
+
+
+phpMyAdmin -
+
+
+
+