From f6cf5fdf8895eb1c4110bafbb9f6473086f0e0d1 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 23 Apr 2012 16:17:20 +0000 Subject: [PATCH] [-] BO : Fix #PSTEST-1185 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14828 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminShippingController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php index c0a6b5034..004e23e61 100644 --- a/controllers/admin/AdminShippingController.php +++ b/controllers/admin/AdminShippingController.php @@ -91,17 +91,20 @@ class AdminShippingControllerCore extends AdminController public function initContent() { + $array_carrier = array(); $carriers = Carrier::getCarriers($this->context->language->id, true, false, false, null, Carrier::PS_CARRIERS_AND_CARRIER_MODULES_NEED_RANGE); foreach ($carriers as $key => $carrier) if ($carrier['is_free']) unset($carriers[$key]); + else + $array_carrier[] = $carrier['id_carrier']; $id_carrier = Tools::getValue('id_carrier'); if (count($carriers)) { if (!$id_carrier) - $id_carrier = (int)$carriers[0]['id_carrier']; + $id_carrier = (int)$array_carrier[0]; $carrierSelected = new Carrier($id_carrier); }