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

// fixed backward compatibility issue

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16505 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete committed 2012-07-20 12:41:20 +00:00
1 parent ce5109ea1d
commit 4f9c604d33
1 file changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+6 -8
View File
@@ -446,16 +446,18 @@ class FrontControllerCore extends Controller
$this->js_files = Media::cccJs($this->js_files); $this->js_files = Media::cccJs($this->js_files);
} }
$this->context->smarty->assign('css_files', $this->css_files); // Call hook before assign of css_files and js_files in order to include correctly all css and javascript files
$this->context->smarty->assign('js_files', array_unique($this->js_files)); $this->context->smarty->assign(array(
$this->context->smarty->assign(array(
'HOOK_HEADER' => $hook_header, 'HOOK_HEADER' => $hook_header,
'HOOK_TOP' => Hook::exec('displayTop'), 'HOOK_TOP' => Hook::exec('displayTop'),
'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''), 'HOOK_LEFT_COLUMN' => ($this->display_column_left ? Hook::exec('displayLeftColumn') : ''),
'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''), 'HOOK_RIGHT_COLUMN' => ($this->display_column_right ? Hook::exec('displayRightColumn', array('cart' => $this->context->cart)) : ''),
'HOOK_FOOTER' => Hook::exec('displayFooter')
)); ));
$this->context->smarty->assign('css_files', $this->css_files);
$this->context->smarty->assign('js_files', array_unique($this->js_files));
$this->display_header = $display; $this->display_header = $display;
$this->context->smarty->display(_PS_THEME_DIR_.'header.tpl'); $this->context->smarty->display(_PS_THEME_DIR_.'header.tpl');
@@ -468,10 +470,6 @@ class FrontControllerCore extends Controller
{ {
// This method will be removed in 1.6 // This method will be removed in 1.6
Tools::displayAsDeprecated(); Tools::displayAsDeprecated();
$this->context->smarty->assign(array(
'HOOK_RIGHT_COLUMN' => Hook::exec('displayRightColumn', array('cart' => $this->context->cart)),
'HOOK_FOOTER' => Hook::exec('displayFooter'),
));
$this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl'); $this->context->smarty->display(_PS_THEME_DIR_.'footer.tpl');
} }