Fixed error handliong in forced upgrade mode.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ac6da0e955ba36c0f960678a387b957a84f4f3d1..66ef3df9ced632b320bc28f34ef4eb4537eb1182 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -24,6 +24,8 @@ $ -> Affected files
 $ /sql/alter2.1.sql
 # [0000106] Error blocking direct invoice for currencies not listed by ECB.
 $ sales/includes/cart_class.inc
+# Fixed error handling in forced upgrade mode.
+$ admin/db/maintenance_db.inc
 + Added backtrace debugging function;
 $ /includes/ui/ui_view.inc
 

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 1d9a027380273950d44cb58f32aa6ba175f6c2fe..622ed2de448a8caae61b4ef0594fbb3d1517e7a9 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -137,6 +137,8 @@ function db_import($filename, $connection, $force=true)
        $sql_errors = array();
 
        ini_set("max_execution_time", "180");
+       db_query("SET foreign_key_checks=0");
+
        // uncrompress gziped backup files
        if (strpos($filename, ".gzip") || strpos($filename, ".GZIP"))
                $lines = db_ungzip("lines", $filename);
@@ -209,7 +211,7 @@ function db_import($filename, $connection, $force=true)
                {
                        if (!db_query($table_query[0]))
                        {       
-                               if (!$force && !in_array(db_error_no(), $ignored_mysql_errors)) {
+                               if (!in_array(db_error_no(), $ignored_mysql_errors) || !$force) {
                                        $sql_errors[] = array(db_error_msg($db), $table_query[1]);
                                }
                        }
@@ -223,12 +225,14 @@ function db_import($filename, $connection, $force=true)
                {
                        if (!db_query($data_query[0]))
                        {
-                               if (!$force && !in_array(db_error_no(),$ignored_mysql_errors))
+                               if (!in_array(db_error_no(),$ignored_mysql_errors) || !$force)
                                        $sql_errors[] = array(db_error_msg($db), $data_query[1]);
                        }
                }
        }
        
+       db_query("SET foreign_key_checks=1");
+
        if (count($sql_errors)) {
                // display first failure message; the rest are probably derivative 
                $err = $sql_errors[0];