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

// Moved some header() functions #PSCFV-4022

Browse Source
This commit is contained in:
dMetzger
2012-09-13 07:21:06 +00:00
parent b010ed5742
commit 2a449daca3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminThemesController.php
+5 -4
View File
@@ -96,6 +96,10 @@ class AdminThemesControllerCore extends AdminController
public function init() public function init()
{ {
// No cache for auto-refresh uploaded logo
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
parent::init(); parent::init();
$this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false; $this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false;
@@ -357,12 +361,9 @@ class AdminThemesControllerCore extends AdminController
if (file_exists(_PS_IMG_DIR_.'logo.jpg')) if (file_exists(_PS_IMG_DIR_.'logo.jpg'))
{ {
list($width, $height, $type, $attr) = getimagesize(_PS_IMG_DIR_.Configuration::get('PS_LOGO')); list($width, $height, $type, $attr) = getimagesize(_PS_IMG_DIR_.Configuration::get('PS_LOGO'));
Configuration::updateValue('SHOP_LOGO_WIDTH', (int)round($width));
Configuration::updateValue('SHOP_LOGO_HEIGHT', (int)round($height)); Configuration::updateValue('SHOP_LOGO_HEIGHT', (int)round($height));
Configuration::updateValue('SHOP_LOGO_WIDTH', (int)round($width));
} }
// No cache for auto-refresh uploaded logo
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
$this->content .= $content; $this->content .= $content;
return parent::initContent(); return parent::initContent();