From e354f4ea9824cb0b409c26ba0fff377c93b34992 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 30 Aug 2009 13:06:31 +0000 Subject: [PATCH] bug #2826986 [display] Order by BLOB and range display --- ChangeLog | 1 + libraries/display_tbl.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec7763227..77d3f5802 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA inside a subquery - bug #2837722 [export] Run complex SQL then export does not work - bug #2839548 [export] Triggers order on export +- bug #2826986 [display] Order by BLOB and range display 3.2.1.0 (2009-08-09) - bug #2799009 Login with ipv6 IP address breaks redirect diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 52233d570..69b61f83d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1861,11 +1861,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) if ($sorted_column_index !== false) { // fetch first row of the result set $row = PMA_DBI_fetch_row($dt_result); - $column_for_first_row = $row[$sorted_column_index]; + $column_for_first_row = substr($row[$sorted_column_index], 0, $GLOBALS['cfg']['LimitChars']); // fetch last row of the result set PMA_DBI_data_seek($dt_result, $num_rows - 1); $row = PMA_DBI_fetch_row($dt_result); - $column_for_last_row = $row[$sorted_column_index]; + $column_for_last_row = substr($row[$sorted_column_index], 0, $GLOBALS['cfg']['LimitChars']); // reset to first row for the loop in PMA_displayTableBody() PMA_DBI_data_seek($dt_result, 0); // we could also use here $sort_expression_nodirection