From 8782c1c5b8b5e836dd0d52c2986e95d7eedb54b4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 27 Dec 2013 10:04:55 -0500 Subject: [PATCH] bug #4131 Import: "number of rows to skip" is ambiguous Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/display_import.lib.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3060da03a3..a6d6c30432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4198 Hovering over pie chart gives fatal JS error - bug #4200 Missing syntax highlighting - bug #4201 Exports are not compressed +- bug #4131 Import: "number of rows to skip" is ambiguous 4.1.2.0 (2013-12-23) - bug #4178 Quick edit for BIT type does not work diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index f359e90e19..493330b40a 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -299,7 +299,10 @@ function PMA_getHtmlForImportOptionsPartialImport($timeout_passed, $offset) if (! (isset($timeout_passed) && $timeout_passed)) { $html .= '
'; $html .= ' '; $html .= '