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

[*] FO: use initLogoAndFavicon() function

Browse Source
This commit is contained in:
PrestaEdit
2012-11-29 21:57:04 +01:00
parent f7b40b24b9
commit 99b97d9bb7
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+4 -10
View File
@@ -604,12 +604,8 @@ class FrontControllerCore extends Controller
if (!in_array(Tools::getRemoteAddr(), explode(',', Configuration::get('PS_MAINTENANCE_IP')))) if (!in_array(Tools::getRemoteAddr(), explode(',', Configuration::get('PS_MAINTENANCE_IP'))))
{ {
header('HTTP/1.1 503 temporarily overloaded'); header('HTTP/1.1 503 temporarily overloaded');
$this->context->smarty->assign(array(
'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'), $this->context->smarty->assign($this->initLogoAndFavicon());
'logo_image_width' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_WIDTH') : Configuration::get('SHOP_LOGO_MOBILE_WIDTH')),
'logo_image_height' => ($this->context->getMobileDevice() == false ? Configuration::get('SHOP_LOGO_HEIGHT') : Configuration::get('SHOP_LOGO_MOBILE_HEIGHT')),
'logo_url' => ($this->context->getMobileDevice() == false ? _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME') : _PS_IMG_.Configuration::get('PS_LOGO_MOBILE').'?'.Configuration::get('PS_IMG_UPDATE_TIME'))
));
$template_dir = ($this->context->getMobileDevice() == true ? _PS_THEME_MOBILE_DIR_ : _PS_THEME_DIR_); $template_dir = ($this->context->getMobileDevice() == true ? _PS_THEME_MOBILE_DIR_ : _PS_THEME_DIR_);
$this->smartyOutputContent($template_dir.'maintenance.tpl'); $this->smartyOutputContent($template_dir.'maintenance.tpl');
@@ -784,13 +780,11 @@ class FrontControllerCore extends Controller
'img_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'), 'img_update_time' => Configuration::get('PS_IMG_UPDATE_TIME'),
'static_token' => Tools::getToken(false), 'static_token' => Tools::getToken(false),
'token' => Tools::getToken(), 'token' => Tools::getToken(),
'logo_image_width' => Configuration::get('SHOP_LOGO_WIDTH'),
'logo_image_height' => Configuration::get('SHOP_LOGO_HEIGHT'),
'priceDisplayPrecision' => _PS_PRICE_DISPLAY_PRECISION_, 'priceDisplayPrecision' => _PS_PRICE_DISPLAY_PRECISION_,
'content_only' => (int)Tools::getValue('content_only'), 'content_only' => (int)Tools::getValue('content_only'),
'logo_url' => _PS_IMG_.Configuration::get('PS_LOGO').'?'.Configuration::get('PS_IMG_UPDATE_TIME'),
'favicon_url' => _PS_IMG_.Configuration::get('PS_FAVICON'),
)); ));
$this->context->smarty->assign($this->initLogoAndFavicon());
} }
public function initFooter() public function initFooter()