The branch, master has been updated via b22daddbb7f09c5feae831a379a437a6ad74e147 (commit) via bc5d816449822928ce5fcb7d82ed216bfe0c3f45 (commit) from f81c051ea41121bf97f11113bd76d2bf19521cd7 (commit)
- Log ----------------------------------------------------------------- commit b22daddbb7f09c5feae831a379a437a6ad74e147 Merge: f81c051ea41121bf97f11113bd76d2bf19521cd7 bc5d816449822928ce5fcb7d82ed216bfe0c3f45 Author: Michal Čihař mcihar@novell.com Date: Tue May 11 11:56:31 2010 +0200
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 4d26cba..dc4e39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ $Id$ 3.3.4.0 (not yet released) - bug #2996161 [import] properly escape import value - 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) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 468959f..538409f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -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
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_column = PMA_unQuote($sort_column); // find the sorted column index in row result
hooks/post-receive
-
Michal Čihař