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

// changes to header and footer

Browse Source
This commit is contained in:
tDidierjean
2011-08-10 13:11:56 +00:00
parent 792ce71cd4
commit d8cbb2bafc
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+1 -6
View File
@@ -505,10 +505,8 @@ class FrontControllerCore
$this->init(); $this->init();
// if this function is called from a module, do a fast init // if this function is called from a module, do a fast init
else if (!$this->context) else if (!$this->context)
{
$this->context = Context::getContext(); $this->context = Context::getContext();
$this->setMedia();
}
// P3P Policies (http://www.w3.org/TR/2002/REC-P3P-20020416/#compact_policies) // P3P Policies (http://www.w3.org/TR/2002/REC-P3P-20020416/#compact_policies)
header('P3P: CP="IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA"'); header('P3P: CP="IDC DSP COR CURa ADMa OUR IND PHY ONL COM STA"');
@@ -551,10 +549,7 @@ class FrontControllerCore
$this->init(); $this->init();
// if this function is called from a module, do a fast init // if this function is called from a module, do a fast init
else if (!$this->context) else if (!$this->context)
{
$this->context = Context::getContext(); $this->context = Context::getContext();
$this->setMedia();
}
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'HOOK_RIGHT_COLUMN' => Module::hookExec('rightColumn', array('cart' => $this->context->cart)), 'HOOK_RIGHT_COLUMN' => Module::hookExec('rightColumn', array('cart' => $this->context->cart)),
footer.php
+6 -1
View File
@@ -24,5 +24,10 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
$controller = new FrontController();
if (isset(Context::getContext()->controller))
$controller = Context::getContext()->controller;
else
$controller = new FrontController();
$controller->displayFooter(); $controller->displayFooter();
header.php
+5 -1
View File
@@ -25,6 +25,10 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
$controller = new FrontController(); if (isset(Context::getContext()->controller))
$controller = Context::getContext()->controller;
else
$controller = new FrontController();
$controller->displayHeader(); $controller->displayHeader();
modules/favoriteproducts/favoriteproducts-account.php
+2 -2
View File
@@ -38,9 +38,9 @@ if (!Context::getContext()->cookie->isLogged())
include(dirname(__FILE__).'/../../header.php'); include(dirname(__FILE__).'/../../header.php');
if ((int)Context::getContext()->cookie->id_customer) if ((int)Context::getContext()->customer->id)
{ {
$smarty->assign('favoriteProducts', FavoriteProduct::getFavoriteProducts((int)Context::getContext()->cookie->id_customer, (int)Context::getContext()->cookie->id_lang)); $smarty->assign('favoriteProducts', FavoriteProduct::getFavoriteProducts((int)Context::getContext()->customer->id, (int)Context::getContext()->language->id));
echo Module::display(dirname(__FILE__).'/favoriteproducts.php', 'favoriteproducts-account.tpl'); echo Module::display(dirname(__FILE__).'/favoriteproducts.php', 'favoriteproducts-account.tpl');
} }