From 2071fa36d7f891d45b337036351453c37f908172 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 5 Dec 2003 13:34:42 +0000
Subject: [PATCH] bug 854696

---
 libraries/display_tbl.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index e649c5fdc..cc20e4721 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -616,7 +616,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
               . '&amp;pos=' . $pos
               . '&amp;disp_direction=' . $disp_direction
               . '&amp;repeat_cells=' . $repeat_cells
-              . '&amp;goto=' . $gotXo
+              . '&amp;goto=' . $goto
               . '&amp;dontlimitchars=' . (($dontlimitchars) ? 0 : 1);
 
     //     ... before the result table
@@ -750,8 +750,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
 
             if (($is_join
                 && !preg_match('~([^[:space:],]|`[^`]`)[[:space:]]+(as[[:space:]]+)?' . $fields_meta[$i]->name . '~i', $select_stt[1], $parts)) 
-               || (
-                   $analyzed_sql[0]['select_expr'][$i]['expr'] !=
+               || ( 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']) ) {
                 $sort_tbl = PMA_backquote($fields_meta[$i]->table) . '.';
             } else {