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

// retrocompatibility fix : displayHeader and displayFooter

Browse Source
This commit is contained in:
mMarinetti
2011-12-20 17:17:57 +00:00
parent 2941895b6b
commit 9df69218f0
3 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
classes/FrontController.php
View File

@@ -386,6 +386,52 @@ class FrontControllerCore extends Controller
));
}
/**
* @deprecated
*/
public function displayHeader($display = true)
{
// This method will be removed in 1.6
Tools::displayAsDeprecated();
$this->initHeader();
$hook_header = Hook::exec('displayHeader');
if ((Configuration::get('PS_CSS_THEME_CACHE') OR Configuration::get('PS_JS_THEME_CACHE')) AND is_writable(_PS_THEME_DIR_.'cache'))
{
// CSS compressor management
if (Configuration::get('PS_CSS_THEME_CACHE'))
$this->css_files = Media::cccCSS($this->css_files);
//JS compressor management
if (Configuration::get('PS_JS_THEME_CACHE'))
$this->js_files = Media::cccJs($this->js_files);
}
$this->context->smarty->assign('css_files', $this->css_files);
$this->context->smarty->assign('js_files', array_unique($this->js_files));
$this->context->smarty->assign(array(
'HOOK_HEADER' => $hook_header,
'HOOK_TOP' => Hook::exec('displayTop'),
));
$this->display_header = $display;
$this->context->smarty->display(_PS_THEME_DIR_.'header.tpl');
}
/**
* @deprecated
*/
public function displayFooter($display = true)
{
// This method will be removed in 1.6
Tools::displayAsDeprecated();
$this->context->smarty->assign(array(
'HOOK_RIGHT_COLUMN' => Hook::exec('displayRightColumn', array('cart' => $this->context->cart)),
'HOOK_FOOTER' => Hook::exec('footer'),
));
$this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl');
}
public function initCursedPage()
{
return $this->displayMaintenancePage();
@@ -609,7 +655,6 @@ class FrontControllerCore extends Controller
'HOOK_FOOTER' => Hook::exec('footer'),
));
}
public function getLiveEditFooter(){

5
footer.php
View File

@@ -32,6 +32,5 @@ else
$controller = new FrontController();
$controller->init();
}
$controller->initFooter();
Context::getContext()->smarty->display(_PS_THEME_DIR_.'footer.tpl');
Tools::displayFileAsDeprecated();
$controller->displayFooter();

5
header.php
View File

@@ -32,6 +32,5 @@ else
$controller = new FrontController();
$controller->init();
}
$controller->initHeader();
Context::getContext()->smarty->display(_PS_THEME_DIR_.'header.tpl');
Tools::displayFileAsDeprecated();
$controller->displayHeader();