// MERGE with trunk revision 7754

2011-07-27 12:48:42 +00:00
parent 21017fb5d8
commit 233c0076b7
182 changed files with 6179 additions and 1333 deletions
@@ -360,7 +360,9 @@ class ParentOrderControllerCore extends FrontController
 		$this->context->smarty->assign(array(
 			'checked' => $this->_setDefaultCarrierSelection($carriers),
 			'carriers' => $carriers,
-			'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT')),
+			'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT'))
+		));
+		self::$smarty->assign(array(
 			'HOOK_EXTRACARRIER' => Module::hookExec('extraCarrier', array('address' => $address)),
 			'HOOK_BEFORECARRIER' => Module::hookExec('beforeCarrier', array('carriers' => $carriers))
 		));