From e61b2135da52051bb158c37b9eed35d734bf441c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 1 Dec 2016 11:02:04 +0100 Subject: [PATCH] Fixed SQL export with newlines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove manual escaping where we do proper escaping through MySQL extension. Fixes #12765 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/plugins/export/ExportSql.php | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index dff689a43e..dc5818f465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - issue #12760 Fix Notice regarding 'Undefined index: users' - issue #12762 Fixed parsing of SQL with BINARY function - issue #12588 ReCaptcha now works without allow_url_fopen +- issue #12765 Fixed SQL export with newlines 4.6.5.1 (2016-11-25) - issue #12735 Incorrect parameters to escapeString in Node.php diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php index df13901294..b44ddc07c3 100644 --- a/libraries/plugins/export/ExportSql.php +++ b/libraries/plugins/export/ExportSql.php @@ -2317,8 +2317,6 @@ class ExportSql extends ExportPlugin } //\x08\\x09, not required - $search = array("\x00", "\x0a", "\x0d", "\x1a"); - $replace = array('\0', '\n', '\r', '\Z'); $current_row = 0; $query_size = 0; if (($GLOBALS['sql_insert_syntax'] == 'extended' @@ -2411,13 +2409,7 @@ class ExportSql extends ExportPlugin } else { // something else -> treat as a string $values[] = '\'' - . $GLOBALS['dbi']->escapeString( - str_replace( - $search, - $replace, - $row[$j] - ) - ) + . $GLOBALS['dbi']->escapeString($row[$j]) . '\''; } // end if } // end for