From 84ad2a865c82dac2924c04299952d5e87bf71ae9 Mon Sep 17 00:00:00 2001 From: Aris Feryanto Date: Tue, 14 Jun 2011 09:38:34 +0700 Subject: [PATCH] Fix PMA_isBrowsing criteria --- libraries/display_tbl.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index acd8c711ee..b50a60d9a0 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -192,11 +192,11 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total) function PMA_isBrowsing() { // global variables set from sql.php - global $is_count, $is_export, $is_func, $is_analyze; + global $is_count, $is_export, $is_func, $is_analyse; global $analyzed_sql; - - return basename($GLOBALS['PMA_PHP_SELF']) == 'sql.php' - && ! ($is_count || $is_export || $is_func || $is_analyse) + + return ! ($is_count || $is_export || $is_func || $is_analyse) + && count($analyzed_sql[0]['select_expr']) == 0 && isset($analyzed_sql[0]['queryflags']['select_from']) && count($analyzed_sql[0]['table_ref']) == 1; }