From e12582acdb3254df2ee46d9acff3456518c8ac8e Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Mon, 16 Mar 2015 19:04:42 +0530 Subject: [PATCH 1/2] Fix bug#4807 Don't add `.` if table name is not set when trying to get column in sort expression. Signed-off-by: Nisarg Jhaveri --- libraries/DisplayResults.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 48035a2546..6b321951b5 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2022,7 +2022,10 @@ class PMA_DisplayResults if (/*overload*/mb_strpos($name_to_use_in_sort, '(') !== false) { $sort_order .= $query_head . $name_to_use_in_sort . ' ' ; } else { - $sort_order .= $query_head . $sort_tbl_new . "." + if (/*overload*/mb_strlen($sort_tbl_new) > 0) { + $sort_tbl_new .= "."; + } + $sort_order .= $query_head . $sort_tbl_new . PMA_Util::backquote( $name_to_use_in_sort ) . ' ' ; From da656d7f5d51956508257e5f53761732915f85f2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 17 Mar 2015 08:43:48 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 98d2072d80..59d7aa94a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.3.13.0 (not yet released) - bug #4803 "Show hidden items" is sometimes hidden +- bug #4807 Breaks when sorting by multiple columns while using UNION 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header