// REVERT MERGE

2011-07-27 13:35:06 +00:00
parent 233c0076b7
commit 5f6f018885
182 changed files with 1335 additions and 6181 deletions
@@ -360,9 +360,7 @@ class ParentOrderControllerCore extends FrontController
 		$this->context->smarty->assign(array(
 			'checked' => $this->_setDefaultCarrierSelection($carriers),
 			'carriers' => $carriers,
-			'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT'))
-		));
-		self::$smarty->assign(array(
+			'default_carrier' => (int)(Configuration::get('PS_CARRIER_DEFAULT')),
 			'HOOK_EXTRACARRIER' => Module::hookExec('extraCarrier', array('address' => $address)),
 			'HOOK_BEFORECARRIER' => Module::hookExec('beforeCarrier', array('carriers' => $carriers))
 		));