[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10706-g08c0f4e

[Marc Delisle]

The branch, master has been updated
       via  08c0f4e92115f84e381775a42b7d644309be9163 (commit)
      from  2f580bb085371c673f469a82d7896041f508d785 (commit)


- Log -----------------------------------------------------------------
commit 08c0f4e92115f84e381775a42b7d644309be9163
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Oct 31 05:51:38 2010 -0400

    undefined variables

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

Summary of changes:
 js/sql.js |    3 ++-
 sql.php   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 995c4ac..0c39fbe 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -625,7 +625,8 @@ $(document).ready(function() {
                             'rel_fields_list' : rel_fields_list,
                             'do_transformations' : transformation_fields,
                             'transform_fields_list' : transform_fields_list,
-                            'goto' : 'sql.php'
+                            'goto' : 'sql.php',
+                            'submit_type' : 'save'
                           };
 
         $.post('tbl_replace.php', post_params, function(data) {
diff --git a/sql.php b/sql.php
index f4b3ed4..351fb20 100644
--- a/sql.php
+++ b/sql.php
@@ -677,7 +677,7 @@ if (0 == $num_rows || $is_affected) {
         if(isset($GLOBALS['display_query'])) {
             $extra_data['sql_query'] = PMA_showMessage(NULL, $GLOBALS['display_query']);
         }
-        if ($GLOBALS['reload'] == 1) {
+        if (isset($GLOBALS['reload']) && $GLOBALS['reload'] == 1) {
             $extra_data['reload'] = 1;
             $extra_data['db'] = $GLOBALS['db'];
         } 


hooks/post-receive
-- 
phpMyAdmin