From f7353b98ee062b45d4db5155dc623e22d6fdaf6f Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 27 Mar 2012 16:12:40 +0000 Subject: [PATCH] // Wrong arg could be passed to foreach --- classes/stock/Warehouse.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php index 18c745529..244f1283d 100644 --- a/classes/stock/Warehouse.php +++ b/classes/stock/Warehouse.php @@ -164,6 +164,9 @@ class WarehouseCore extends ObjectModel $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); + if (!is_array($res)) + return $ids_carrier; + foreach ($res as $carriers) foreach ($carriers as $carrier) $ids_carrier[] = $carrier; @@ -592,6 +595,9 @@ class WarehouseCore extends ObjectModel $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query); + if (!is_array($res)) + return $ids_carrier; + foreach ($res as $carriers) foreach ($carriers as $carrier) $ids_carrier[] = $carrier;