From e12582acdb3254df2ee46d9acff3456518c8ac8e Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Date: Mon, 16 Mar 2015 19:04:42 +0530
Subject: [PATCH] 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 <nisargjhaveri@gmail.com>
---
 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
                   ) .  ' ' ;