gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1463 from rakeshkaundilya/QA_4_3

Browse Source 
BugFix#4714
This commit is contained in:
Marc Delisle 2015-01-20 12:47:18 -05:00
commit 5c8ed0e35e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
import.php
View File

@ -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'])) {

7
libraries/sql.lib.php
View File

@ -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(