webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00
Code Activity

bug 4245 fix with minimum changes

Browse Source 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
This commit is contained in:
Sampath Liyanage
2014-01-27 21:29:27 +05:30
parent 24cc797e50
commit e8fa9e5335
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Util.class.php
View File

@@ -1012,7 +1012,17 @@ class PMA_Util
$sql_query = '';
}
}
if (isset($GLOBALS['db']) && isset($GLOBALS['table'])){
// Parse and analyze the query
$analyzed_sql_results = PMA_SQP_getParserAnalyzeMap(
$sql_query, $GLOBALS['db']);
// Synchronize message(query) with table
PMA_handleSortOrder($GLOBALS['db'], $GLOBALS['table'],
$analyzed_sql_results, $sql_query);
}
if (isset($GLOBALS['using_bookmark_message'])) {
$retval .= $GLOBALS['using_bookmark_message']->getDisplay();
unset($GLOBALS['using_bookmark_message']);

4
libraries/sql.lib.php
View File

@@ -227,7 +227,8 @@ function PMA_getTableHtmlForMultipleQueries(
function PMA_handleSortOrder($db, $table, &$analyzed_sql_results, &$full_sql_query)
{
$pmatable = new PMA_Table($table, $db);
if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) {
if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])
&& isset($GLOBALS['default_query']) && $GLOBALS['default_query']) {
$sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
if ($sorted_col) {
//remove the tablename from retrieved preference
@@ -1170,6 +1171,7 @@ function PMA_appendLimitClause($full_sql_query, $analyzed_sql, $display_query)
*/
function PMA_getDefaultSqlQueryForBrowse($db, $table)
{
$GLOBALS['default_query'] = true;
include_once 'libraries/bookmark.lib.php';
$book_sql_query = PMA_Bookmark_get(
$db,