nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 854696

Browse Source
This commit is contained in:
Marc Delisle
2003-12-05 13:34:42 +00:00
parent 7a4c99c8df
commit 2071fa36d7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/display_tbl.lib.php
View File

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