//Merge branch release

This commit is contained in:
vAugagneur
2013-01-02 09:56:20 +01:00
475 changed files with 23768 additions and 22253 deletions
+2 -2
View File
@@ -116,12 +116,12 @@ class ManufacturerControllerCore extends FrontController
$this->pagination($nbProducts);
foreach ($data as &$item)
$item['image'] = (!file_exists(_PS_MANU_IMG_DIR_.'/'.$item['id_manufacturer'].'-medium_default.jpg')) ? $this->context->language->iso_code.'-default' : $item['id_manufacturer'];
$item['image'] = (!file_exists(_PS_MANU_IMG_DIR_.'/'.$item['id_manufacturer'].'-'.ImageType::getFormatedName('medium').'.jpg')) ? $this->context->language->iso_code.'-default' : $item['id_manufacturer'];
$this->context->smarty->assign(array(
'pages_nb' => ceil($nbProducts / (int)($this->n)),
'nbManufacturers' => $nbProducts,
'mediumSize' => Image::getSize('medium_default'),
'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')),
'manufacturers' => $data,
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'),
));