nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3123433 [interface] Avoid double escaping of MySQL errors.

Browse Source 
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
This commit is contained in:
Michal Čihař
2010-12-02 17:14:59 +01:00
parent 219f5a4fb9
commit 89f03ef81b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -123,6 +123,7 @@
- bug #3115519 [interface] Prevent long queries from being shown in confirmation popup - bug #3115519 [interface] Prevent long queries from being shown in confirmation popup
- patch #3112792 [navi] Left panel table grouping incorrect, - patch #3112792 [navi] Left panel table grouping incorrect,
thanks to garas - garas thanks to garas - garas
- bug #3123433 [interface] Avoid double escaping of MySQL errors.
3.3.9.0 (not yet released) 3.3.9.0 (not yet released)
- bug [doc] Fix references to MySQL doc - bug [doc] Fix references to MySQL doc

1
libraries/common.lib.php
View File

@@ -617,7 +617,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
} // end if } // end if
if (!empty($error_message)) { if (!empty($error_message)) {
$error_message = htmlspecialchars($error_message);
$error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message); $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message);
} }
// modified to show the help on error-returns // modified to show the help on error-returns

2
sql.php
View File

@@ -377,7 +377,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
$table = ''; $table = '';
} }
$active_page = $goto; $active_page = $goto;
$message = PMA_Message::rawError(htmlspecialchars($error)); $message = PMA_Message::rawError($error);
if( $GLOBALS['is_ajax_request'] == true) { if( $GLOBALS['is_ajax_request'] == true) {
PMA_ajaxResponse($message, false); PMA_ajaxResponse($message, false);