// Wrong arg could be passed to foreach

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14308 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-27 16:12:40 +00:00
parent 6b0fd26ea8
commit 2c3913b061
1 changed files with 6 additions and 0 deletions
@@ -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;