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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Francois Gaillard
2013-09-19 17:31:42 +02:00
parent 63f4743134 e0b59082f9
commit 8c6aaa3c7d
36 changed files with 330 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocknewproducts/blocknewproducts.php
+5
View File
@@ -134,6 +134,11 @@ class BlockNewProducts extends Module
{
return $this->hookRightColumn($params);
}
public function hookHome($params)
{
return $this->hookRightColumn($params);
}
public function hookHeader($params)
{
modules/editorial/editorial.php
+3 -3
View File
@@ -218,9 +218,9 @@ class Editorial extends Module
if ($input['name'] != 'body_homepage_logo')
$helper->fields_value[$input['name']] = $editorial->{$input['name']};
$helper->fields_value['image'] = (file_exists(dirname(__FILE__).'/homepage_logo_'.(int)$id_shop.'.jpg') ? '<img src="'.$this->_path.'homepage_logo_'.(int)$id_shop.'.jpg">' : '');
if ($helper->fields_value['image'])
$helper->fields_value['size'] = filesize(dirname(__FILE__).'/homepage_logo_'.(int)$id_shop.'.jpg') / 1000;
$helper->fields_value['body_homepage_logo']['image'] = (file_exists(dirname(__FILE__).'/homepage_logo_'.(int)$id_shop.'.jpg') ? '<img src="'.$this->_path.'homepage_logo_'.(int)$id_shop.'.jpg">' : '');
if ($helper->fields_value['body_homepage_logo'])
$helper->fields_value['body_homepage_logo']['size'] = filesize(dirname(__FILE__).'/homepage_logo_'.(int)$id_shop.'.jpg') / 1000;
$this->_html .= $helper->generateForm($this->fields_form);
return $this->_html;