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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2010-05-11 11:56:31 +02:00
parent f81c051ea4 bc5d816449
commit b22daddbb7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -85,6 +85,7 @@ $Id$
3.3.4.0 (not yet released) 3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value
- bug #2998889 [import] Import button does not work in Catalan - bug #2998889 [import] Import button does not work in Catalan
- [browse] Fix handling of sort order if only column is specified.
3.3.3.0 (2010-05-10) 3.3.3.0 (2010-05-10)
- patch #2982480 [navi] Do not group if there would be one table in group, - patch #2982480 [navi] Do not group if there would be one table in group,

7
libraries/display_tbl.lib.php
View File

@@ -1892,7 +1892,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
// 1.4 Prepares display of first and last value of the sorted column // 1.4 Prepares display of first and last value of the sorted column
if (! empty($sort_expression_nodirection)) { if (! empty($sort_expression_nodirection)) {
list($sort_table, $sort_column) = explode('.', $sort_expression_nodirection); if (strpos($sort_expression_nodirection, '.') === false) {
$sort_table = $table;
$sort_column = $sort_expression_nodirection;
} else {
list($sort_table, $sort_column) = explode('.', $sort_expression_nodirection);
}
$sort_table = PMA_unQuote($sort_table); $sort_table = PMA_unQuote($sort_table);
$sort_column = PMA_unQuote($sort_column); $sort_column = PMA_unQuote($sort_column);
// find the sorted column index in row result // find the sorted column index in row result