dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again

Browse Source
This commit is contained in:
gRoussac committed 2013-11-27 16:26:22 +01:00
1 parent 2b210e0732
commit 068b7100c4
3 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/CmsController.php
+3 -1
View File
@@ -112,7 +112,8 @@ class CmsControllerCore extends FrontController
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'cms' => $this->cms, 'cms' => $this->cms,
'content_only' => (int)(Tools::getValue('content_only')), 'content_only' => (int)(Tools::getValue('content_only')),
'path' => $path 'path' => $path,
'body_classes' => array($this->php_self.'-'.$this->cms->id, $this->php_self.'-'.$this->cms->link_rewrite)
)); ));
if ($this->cms->indexation == 0) if ($this->cms->indexation == 0)
@@ -126,6 +127,7 @@ class CmsControllerCore extends FrontController
'sub_category' => $this->cms_category->getSubCategories($this->context->language->id), 'sub_category' => $this->cms_category->getSubCategories($this->context->language->id),
'cms_pages' => CMS::getCMSPages($this->context->language->id, (int)($this->cms_category->id), true, (int)$this->context->shop->id), 'cms_pages' => CMS::getCMSPages($this->context->language->id, (int)($this->cms_category->id), true, (int)$this->context->shop->id),
'path' => ($this->cms_category->id !== 1) ? Tools::getPath($this->cms_category->id, $this->cms_category->name, false, 'CMS') : '', 'path' => ($this->cms_category->id !== 1) ? Tools::getPath($this->cms_category->id, $this->cms_category->name, false, 'CMS') : '',
'body_classes' => array($this->php_self.'-'.$this->cms_category->id, $this->php_self.'-'.$this->cms_category->link_rewrite)
)); ));
} }
controllers/front/ManufacturerController.php
+3 -2
View File
@@ -106,7 +106,8 @@ class ManufacturerControllerCore extends FrontController
'products' => $products, 'products' => $products,
'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''), 'path' => ($this->manufacturer->active ? Tools::safeOutput($this->manufacturer->name) : ''),
'manufacturer' => $this->manufacturer, 'manufacturer' => $this->manufacturer,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM') 'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM'),
'body_classes' => array($this->php_self.'-'.$this->manufacturer->id, $this->php_self.'-'.$this->manufacturer->link_rewrite)
)); ));
} }
@@ -132,7 +133,7 @@ class ManufacturerControllerCore extends FrontController
'nbManufacturers' => $nbProducts, 'nbManufacturers' => $nbProducts,
'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')), 'mediumSize' => Image::getSize(ImageType::getFormatedName('medium')),
'manufacturers' => $data, 'manufacturers' => $data,
'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'), 'add_prod_display' => Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY')
)); ));
} }
else else
controllers/front/SupplierController.php
+2 -1
View File
@@ -108,7 +108,8 @@ class SupplierControllerCore extends FrontController
'products' => $products, 'products' => $products,
'path' => ($this->supplier->active ? Tools::safeOutput($this->supplier->name) : ''), 'path' => ($this->supplier->active ? Tools::safeOutput($this->supplier->name) : ''),
'supplier' => $this->supplier, 'supplier' => $this->supplier,
'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM') 'comparator_max_item' => Configuration::get('PS_COMPARATOR_MAX_ITEM'),
'body_classes' => array($this->php_self.'-'.$this->supplier->id, $this->php_self.'-'.$this->supplier->link_rewrite)
)); ));
} }