[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-30-g432379c

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  432379c87d6cb06a330c1928b3ec676da886a5f4 (commit)
      from  153515c7f56f45bd21e2dd4081ba18efe19b991b (commit)


- Log -----------------------------------------------------------------
commit 432379c87d6cb06a330c1928b3ec676da886a5f4
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jun 1 12:34:57 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 |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23a8c38..f4d9fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [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 7d84ce7..8e4a701 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1037,7 +1037,7 @@ if (isset($_REQUEST['synchronize_db'])) {
             $criteria, $matching_tables_keys, $target_tables_keys, $p, true);
             unset($alter_str_array[$p]);        
         }                                                           
-        if (isset($add_column_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