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

Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Browse Source
This commit is contained in:
Weblate 2014-01-01 14:16:20 +01:00
commit 7aa348c492
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -4,7 +4,7 @@ phpMyAdmin - ChangeLog
4.1.4.0 (not yet released)
- bug #3840 (additional fix) When exporting to gzip format, the data is compressed 2 times
- bug #4209 Missing compression in one case
- bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-'
4.1.3.0 (2013-12-31)
- bug #3938 PDFDefaultPageSize doc and easy configurability
- bug #4198 Hovering over pie chart gives fatal JS error

11
libraries/sql.lib.php
View File

@ -230,10 +230,11 @@ function PMA_handleSortOrder($db, $table, &$analyzed_sql_results, &$full_sql_que
if (empty($analyzed_sql_results['analyzed_sql'][0]['order_by_clause'])) {
$sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
if ($sorted_col) {
//remove the backquoting and tablename from retrieved preference
//to get just column name
$sorted_col = str_replace('`', '', $sorted_col);
$sorted_col = str_replace($table . '.', '', $sorted_col);
//remove the tablename from retrieved preference
//to get just the column name and the sort order
$sorted_col = str_replace(
PMA_Util::backquote($table) . '.', '', $sorted_col
);
// retrieve the remembered sorting order for current table
$sql_order_to_append = ' ORDER BY ' . $sorted_col . ' ';
$full_sql_query
@ -2278,7 +2279,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
// Handle remembered sorting order, only for single table query
// Handling is not required when it's a union query
// (the parser never sets the 'union' key to 0)
if (PMA_isRememberSortingOrder($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, $full_sql_query);