From 39cd736648e2b9a631ff7d4c1394bfbc3bc35597 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 10 Oct 2011 07:31:35 +0530 Subject: [PATCH] When in 'show as php' mode, no need to have 'refresh'. 'Submit query' is there instead. --- libraries/common.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5dcf21ed22..93034b40d5 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1219,6 +1219,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // Refresh query if (! empty($cfg['SQLQuery']['Refresh']) + && ! isset($GLOBALS['show_as_php']) // 'Submit query' does the same && preg_match('@^(SELECT|SHOW)[[:space:]]+@i', $sql_query) ) { $refresh_link = 'import.php' . PMA_generate_common_url($url_params); @@ -3151,7 +3152,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) /* Backward compatibility in 3.5.x */ if (strpos($string, '@FIELDS@') !== false) { - $string = strtr($string, array('@FIELDS@' => '@COLUMNS@')); + $string = strtr($string, array('@FIELDS@' => '@COLUMNS@')); } /* Fetch columns list if required */