From 1e32b182b081c4e9900c72f86189858ae2d1ceae Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 24 Aug 2012 12:46:25 +0000 Subject: [PATCH] [-] Installer: Fix #PSCFV-3732 --- install-dev/upgrade/php/migrate_orders.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/install-dev/upgrade/php/migrate_orders.php b/install-dev/upgrade/php/migrate_orders.php index a83076a1a..9ce42f810 100644 --- a/install-dev/upgrade/php/migrate_orders.php +++ b/install-dev/upgrade/php/migrate_orders.php @@ -37,27 +37,26 @@ function migrate_orders() // init insert order detail query $values_order_detail = array(); - $col_order_detail = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'order_detail`'); - foreach ($col_order_detail as $k => $field) + $col_order_detail = array(); + $col_order_detail_old = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'order_detail`'); + foreach ($col_order_detail_old as $k => $field) if ($field['Field'] != 'id_order_invoice') $col_order_detail[$k] = $field['Field']; - if (!$col_order_detail) + if (!$col_order_detail_old) return array('error' => 1, 'msg' => 'unable to get fields list from order_detail table'); $insert_order_detail = 'INSERT INTO `'._DB_PREFIX_.'order_detail_2` (`'.implode('`, `', $col_order_detail).'`) VALUES '; // init insert order query $values_order = array(); - $col_orders = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'orders`'); + $col_orders = array(); + $col_orders_old = Db::getInstance()->executeS('SHOW FIELDS FROM `'._DB_PREFIX_.'orders`'); - if (!$col_orders) - { - $res = false; + if (!$col_orders_old) return array('error' => 1, 'msg' => 'unable to get fields list from orders table'); - } - foreach ($col_orders as $k => $field) + foreach ($col_orders_old as $k => $field) $col_orders[$k] = $field['Field']; $insert_order = 'INSERT INTO `'._DB_PREFIX_.'orders_2` (`'.implode('`, `', $col_orders).'`) VALUES ';