[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-8-gbc5d816

The branch, QA_3_3 has been updated via bc5d816449822928ce5fcb7d82ed216bfe0c3f45 (commit) from f4d5f23e2be8b5a8185cc7dd9a5b3febc06cc3b9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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 6649220..5ce0871 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 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 05feefb..d6d93b0 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1882,7 +1882,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 -- phpMyAdmin