bug 854696
This commit is contained in:
@@ -616,7 +616,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
|
||||
. '&pos=' . $pos
|
||||
. '&disp_direction=' . $disp_direction
|
||||
. '&repeat_cells=' . $repeat_cells
|
||||
. '&goto=' . $gotXo
|
||||
. '&goto=' . $goto
|
||||
. '&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 {
|
||||
|
Reference in New Issue
Block a user