From 434c9b739891237ed5ece10c9257dc87d776fd49 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Wed, 4 Jul 2012 14:29:14 +0000 Subject: [PATCH] [-] FO : #PSCFV-2993 #PSCFV-2811 - Default carriers and carrier sorting where ignored --- controllers/admin/AdminCarriersController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index a4fc629a8..c54d9000d 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -126,10 +126,12 @@ class AdminCarriersControllerCore extends AdminController 'cast' => 'intval', 'type' => 'select', 'identifier' => 'id_carrier', - 'list' => array( - -1 => array('id_carrier' => -1, 'name' => $this->l('Best price')), - -2 => array('id_carrier' => -2, 'name' => $this->l('Best grade'))) + - Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS) + 'list' => array_merge( + array( + -1 => array('id_carrier' => -1, 'name' => $this->l('Best price')), + -2 => array('id_carrier' => -2, 'name' => $this->l('Best grade')) + ), + Carrier::getCarriers((int)Configuration::get('PS_LANG_DEFAULT'), true, false, false, null, Carrier::ALL_CARRIERS)) ), 'PS_CARRIER_DEFAULT_SORT' => array( 'title' => $this->l('Sort by:'),