From 2fa47bf4b55105645e35ba4901bdee164ab9451d Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Tue, 24 Apr 2012 09:51:03 +0000
Subject: [PATCH] [-] BO : Fix #PSTEST-1217 : fatal error when all carrier are
 free

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14841 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminShippingController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/controllers/admin/AdminShippingController.php b/controllers/admin/AdminShippingController.php
index 004e23e61..a3dbeee35 100644
--- a/controllers/admin/AdminShippingController.php
+++ b/controllers/admin/AdminShippingController.php
@@ -101,12 +101,15 @@ class AdminShippingControllerCore extends AdminController
 
 		$id_carrier = Tools::getValue('id_carrier');
 
-		if (count($carriers))
+		if (count($carriers) && isset($array_carrier[0]))
 		{
 			if (!$id_carrier)
 				$id_carrier = (int)$array_carrier[0];
-			$carrierSelected = new Carrier($id_carrier);
+
+			$carrierSelected = new Carrier((int)$id_carrier);
 		}
+		else
+			$carrierSelected = new Carrier((int)$id_carrier);
 
 		$currency = $this->context->currency;
 		$rangeObj = $carrierSelected->getRangeObject();