[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20774-g6e1258f

[Madhura Jayaratne]

The branch, master has been updated
       via  6e1258f95460eb244ff1807cc956e394ec1d7de7 (commit)
       via  84c1b79a0884fd8875632cac7d32df2385879b4a (commit)
       via  39cd736648e2b9a631ff7d4c1394bfbc3bc35597 (commit)
      from  c0120649fb23f4c26981f60f2b8aafff5859cdba (commit)


- Log -----------------------------------------------------------------
commit 6e1258f95460eb244ff1807cc956e394ec1d7de7
Merge: 84c1b79 c012064
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Mon Oct 10 08:01:44 2011 +0530

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 84c1b79a0884fd8875632cac7d32df2385879b4a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Mon Oct 10 07:32:16 2011 +0530

    Typo in comment

commit 39cd736648e2b9a631ff7d4c1394bfbc3bc35597
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Mon Oct 10 07:31:35 2011 +0530

    When in 'show as php' mode, no need to have 'refresh'. 'Submit query' is there instead.

-----------------------------------------------------------------------

Summary of changes:
 libraries/common.lib.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 5dcf21e..6054412 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1219,13 +1219,14 @@ 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:]]+ at i', $sql_query)
         ) {
             $refresh_link = 'import.php' . PMA_generate_common_url($url_params);
             $refresh_link = ' [' . PMA_linkOrButton($refresh_link, __('Refresh')) . ']';
         } else {
             $refresh_link = '';
-        } //show as php
+        } //refresh
 
         if (! empty($cfg['SQLValidator']['use'])
             && ! empty($cfg['SQLQuery']['Validate'])
@@ -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 */


hooks/post-receive
-- 
phpMyAdmin