From fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 8 Nov 2014 20:02:10 +0100 Subject: [PATCH 1/2] Fix #4495 Comment lines in multiquery Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + libraries/plugins/import/ImportSql.class.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 821ffe9085..d272af2365 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog + rfe #1547 Wrap No Tables Found message with message box - bug #4559 Logging in causes 100% CPU usage - bug #4564 Designer: spaces in table name with edit table link generates bad links +- bug #4495 Comment lines in multiquery 4.2.12.0 (not yet released) - bug #4574 Blank/white page when JavaScript disabled diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php index 62f3e7ae91..c819b06c6b 100644 --- a/libraries/plugins/import/ImportSql.class.php +++ b/libraries/plugins/import/ImportSql.class.php @@ -296,6 +296,11 @@ class ImportSql extends ImportPlugin //throw new Exception('Unknown case.'); break; } + + if (0 === $this->_firstSearchChar) { + $this->_queryBeginPosition = $this->_delimiterPosition; + } + continue; } From f74ed544f68bc56866503f46ea2b777076b096aa Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Mon, 10 Nov 2014 13:50:03 +0100 Subject: [PATCH 2/2] Remove trailing whitespace. Signed-off-by: Hugues Peccatte --- libraries/tracking.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index fae0d81515..f809e8f803 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -698,7 +698,7 @@ function PMA_getHtmlForOneStatement($entry, $filter_users, * @param array $url_params url parameters * @param string $drop_image_or_text drop image or text * - * @return array + * @return array */ function PMA_getHtmlForDataDefinitionStatements($data, $filter_users, $filter_ts_from, $filter_ts_to, $url_params, $drop_image_or_text