From 915f209ca1aacac0ca0b1cc8490362941e7e26bf Mon Sep 17 00:00:00 2001 From: RAKESH KUMAR Date: Tue, 20 Jan 2015 19:34:12 +0530 Subject: [PATCH] BugFix#4714 Signed-off-by: RAKESH KUMAR --- import.php | 1 + libraries/sql.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/import.php b/import.php index a07531f9d5..460e559f61 100644 --- a/import.php +++ b/import.php @@ -106,6 +106,7 @@ if (! empty($sql_query)) { $import_text = $sql_query; $import_type = 'query'; $format = 'sql'; + $_SESSION['sql_from_query_box'] = true; // If there is a request to ROLLBACK when finished. if (isset($_REQUEST['rollback_query'])) { diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 6c6c15fdcd..4b2cf684f3 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -2369,7 +2369,12 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results, if (PMA_isRememberSortingOrder($analyzed_sql_results) && ! isset($analyzed_sql_results['analyzed_sql'][0]['queryflags']['union']) ) { - PMA_handleSortOrder($db, $table, $analyzed_sql_results, $sql_query); + if(!isset($_SESSION['sql_from_query_box'])) { + PMA_handleSortOrder($db, $table, $analyzed_sql_results, $sql_query); + } else { + unset($_SESSION['sql_from_query_box']); + } + } $displayResultsObject = new PMA_DisplayResults(