diff --git a/ChangeLog b/ChangeLog index 23a8c3871..f4d9fb53b 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 7d84ce70b..8e4a70158 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);