[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4619-g39c73a9

[Marc Delisle]

The branch, master has been updated
       via  39c73a94ee45790fd39190e412d7a007fcca1c2a (commit)
       via  432379c87d6cb06a330c1928b3ec676da886a5f4 (commit)
       via  153515c7f56f45bd21e2dd4081ba18efe19b991b (commit)
      from  1e155e3a32e976c0294d522a255ad2a9bea7ea65 (commit)


- Log -----------------------------------------------------------------
commit 39c73a94ee45790fd39190e412d7a007fcca1c2a
Merge: 1e155e3a32e976c0294d522a255ad2a9bea7ea65 432379c87d6cb06a330c1928b3ec676da886a5f4
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jun 1 12:43:46 2010 -0400

    bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option

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

Summary of changes:
 ChangeLog              |    2 ++
 server_synchronize.php |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 832f8ad..e186f92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,8 @@ $Id$
 + [lang] Updated lot of translation based on work done in master branch.
 - bug #3008411 [databases] Last dropped database remains active in navi
 - bug #2986383 [parser] Not all data being shown / counted
+- bug [synchronize] Rows were deleted in target table regardless of the
+  "Would you like to delete..." option
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/server_synchronize.php b/server_synchronize.php
index b609d34..c5d8077 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1023,9 +1023,9 @@ if (isset($_REQUEST['synchronize_db'])) {
         if (isset($alter_str_array[$p])) {
             PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields,
             $criteria, $matching_tables_keys, $target_tables_keys, $p, true);
-            unset($alter_str_array[$p]);
-        }
-        if (isset($add_column_array[$p])) {
+            unset($alter_str_array[$p]);        
+        }                                                           
+        if (! empty($add_column_array[$p])) {
             PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys,
             $trg_db, $trg_link, $src_db, $src_link);
 


hooks/post-receive
-- 
phpMyAdmin