From 5d88225fe7c471c025a2f11ae8eec387307ef7ce Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 8 Sep 2006 16:44:26 +0000 Subject: [PATCH] bug #1549824, SQL history and quote escape --- ChangeLog | 1 + querywindow.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bb4caa22..d31a3e77a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ $Source$ * lang/check_lang.sh: ignore differences in doc_lang * lang/italian: Update, thanks to Rebe - rebeluca. ### 2.9.0-rc1 released from QA_2_9 + * querywindow.php: bug #1549824, SQL history and quote escaping 2006-09-07 Marc Delisle * lang/turkish: update, thanks to Burak Yavuz - bourock diff --git a/querywindow.php b/querywindow.php index 02695b986..5140ab1c4 100644 --- a/querywindow.php +++ b/querywindow.php @@ -283,8 +283,8 @@ if ( count( $_sql_history ) > 0 .'querydisplay_tab.value = \'' . $tab . '\';' .' document.getElementById(\'hiddenqueryform\').' .'query_history_latest.value = \'' - . preg_replace('/(\r|\n)+/i', '\\n', - htmlentities( $sql, ENT_QUOTES ) ) . '\';' + . preg_replace('/(\r|\n)+/i', '\\n', + PMA_jsFormat($sql, false) ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'auto_commit.value = \'false\';' .' document.getElementById(\'hiddenqueryform\').' @@ -305,8 +305,8 @@ if ( count( $_sql_history ) > 0 .'querydisplay_tab.value = \'' . $tab . '\';' .' document.getElementById(\'hiddenqueryform\').' .'query_history_latest.value = \'' - . preg_replace('/(\r|\n)+/i', '\\r\\n', - htmlentities( $sql, ENT_QUOTES ) ) . '\';' + . preg_replace('/(\r|\n)+/i', '\\r\\n', + PMA_jsFormat($sql, false) ) . '\';' .' document.getElementById(\'hiddenqueryform\').' .'auto_commit.value = \'true\';' .' document.getElementById(\'hiddenqueryform\').'