bug #1170227, copying a db does not refresh the queryframe

NenadGajic · May 30, 2005 · 36099ec · 36099ec
1 parent 5d55e93
commit 36099ec
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
     * footer.inc.php: bug #1209891, db list not refreshed when the left
       frame is positionned on a db, then a manual DROP DATABASE it done
       on another db
+    * db_operations.php, footer.inc.php: bug #1170227, copying a db does not 
+      refresh the queryframe
 
 2005-05-27 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_properties.inc.php: bug #1205940, current timestamp checkbox 

diff --git a/db_operations.php b/db_operations.php
@@ -14,8 +14,13 @@
 
     require_once('./libraries/tbl_move_copy.php');
 
-    if (isset($db_rename) && $db_rename == 'true') $move = TRUE;
-    else $move = FALSE;
+    $force_queryframe_reload = TRUE;
+
+    if (isset($db_rename) && $db_rename == 'true') {
+        $move = TRUE;
+    } else {
+        $move = FALSE;
+    }
 
     if (!isset($newname) || empty($newname)) {
         $message = $strDatabaseEmpty;

diff --git a/footer.inc.php b/footer.inc.php
@@ -32,8 +32,9 @@
     ?>
     var forceQueryFrameReload = false;
 <?php
-    // this flag comes from sql.php when we saw a DROP DATABASE
-    if ($is_drop_database) {
+    // $is_drop_database comes from sql.php when we saw a DROP DATABASE
+    // $force_queryframe_reload comes from db_operations.php
+    if ((isset($is_drop_database) && $is_drop_database) || (isset($force_queryframe_reload) && $force_queryframe_reload == TRUE)) {
 ?>
     forceQueryFrameReload = true;
 <?php