From 1bb4a951a4cb9bba9cca11dce1942c6533ac4b21 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 25 Jan 2004 13:18:19 +0000
Subject: [PATCH] bug 879792

---
 ChangeLog                     | 1 +
 libraries/display_tbl.lib.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e67205718..fdc6e3266 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2004-01-25 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_row_delete.php: bug 882695, broken row highlighting
+    * libraries/display_tbl.lib.php: bug 879792, bad sort link
 
 2004-01-24 Marc Delisle  <lem9@users.sourceforge.net>
     * querywindow.php: PMA_DBI_close() instead of DBI_close()
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 068e6e1a4..0c225f0d5 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -752,7 +752,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                || ( isset($analyzed_sql[0]['select_expr'][$i]['expr'])
                    && isset($analyzed_sql[0]['select_expr'][$i]['column'])
                    && $analyzed_sql[0]['select_expr'][$i]['expr'] !=
-                   $analyzed_sql[0]['select_expr'][$i]['column']) ) {
+                   $analyzed_sql[0]['select_expr'][$i]['column']
+                  && !empty($fields_meta[$i]->table)) ) {
                 $sort_tbl = PMA_backquote($fields_meta[$i]->table) . '.';
             } else {
                 $sort_tbl = '';