[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2766-g37f0d02

[Marc Delisle]

The branch, master has been updated
       via  37f0d02a1eaf1d1b9759fa78902552e5a5a4ea51 (commit)
      from  17c9fb4d28e0410ab5013ca7617b6eca9764d25e (commit)


- Log -----------------------------------------------------------------
commit 37f0d02a1eaf1d1b9759fa78902552e5a5a4ea51
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed May 5 15:34:53 2010 -0400

    avoid confusion with older $str variables

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

Summary of changes:
 libraries/export/sql.php         |   12 ++++++------
 libraries/sql_query_form.lib.php |   20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index e86fed4..47f9003 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -640,13 +640,13 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a
                             $sql_constraints .= $crlf;
                         }
                         if (strpos($sql_lines[$j], 'CONSTRAINT') === FALSE) {
-                            $str_tmp = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $str_tmp;
-                            $sql_constraints .= $str_tmp;
+                            $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
+                            $sql_constraints_query .= $tmp_str;
+                            $sql_constraints .= $tmp_str;
                         } else {
-                            $str_tmp = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $str_tmp;
-                            $sql_constraints .= $str_tmp;
+                            $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
+                            $sql_constraints_query .= $tmp_str;
+                            $sql_constraints .= $tmp_str;
                             preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
                             if (! $first) {
                                 $sql_drop_foreign_keys .= ', ';
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index e1e79f3..6127c3f 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -227,17 +227,17 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
         // prepare for db related
         $db     = $GLOBALS['db'];
         // if you want navigation:
-        $strDBLink = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
+        $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
             . '?' . PMA_generate_common_url($db) . '"';
         if ($is_querywindow) {
-            $strDBLink .= ' target="_self"'
+            $tmp_db_link .= ' target="_self"'
                 . ' onclick="this.target=window.opener.frame_content.name"';
         }
-        $strDBLink .= '>'
+        $tmp_db_link .= '>'
             . htmlspecialchars($db) . '</a>';
         // else use
-        // $strDBLink = htmlspecialchars($db);
-        $legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
+        // $tmp_db_link = htmlspecialchars($db);
+        $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
         if (empty($query)) {
             $query = str_replace('%d',
                 PMA_backquote($db), $GLOBALS['cfg']['DefaultQueryDatabase']);
@@ -252,17 +252,17 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
             'SHOW FULL COLUMNS FROM ' . PMA_backquote($db)
             . '.' . PMA_backquote($GLOBALS['table']));
 
-        $strDBLink = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
+        $tmp_db_link = '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase']
             . '?' . PMA_generate_common_url($db) . '"';
         if ($is_querywindow) {
-            $strDBLink .= ' target="_self"'
+            $tmp_db_link .= ' target="_self"'
                 . ' onclick="this.target=window.opener.frame_content.name"';
         }
-        $strDBLink .= '>'
+        $tmp_db_link .= '>'
             . htmlspecialchars($db) . '</a>';
         // else use
-        // $strDBLink = htmlspecialchars($db);
-        $legend = sprintf(__('Run SQL query/queries on database %s'), $strDBLink);
+        // $tmp_db_link = htmlspecialchars($db);
+        $legend = sprintf(__('Run SQL query/queries on database %s'), $tmp_db_link);
         if (empty($query) && count($fields_list)) {
             $field_names = array();
             foreach ($fields_list as $field) {


hooks/post-receive
-- 
phpMyAdmin