// changes to header and footer

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7997 b9a71923-0436-4b27-9f14-aed3839534dd

classes/FrontController.php

@@ -505,10 +505,8 @@ class FrontControllerCore
 			$this->init();
 		// if this function is called from a module, do a fast init
 		else if (!$this->context)
-		{
 			$this->context = Context::getContext();
-			$this->setMedia();
-		}
+		
 		// 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"');
 
@@ -551,10 +549,7 @@ class FrontControllerCore
 			$this->init();
 		// if this function is called from a module, do a fast init
 		else if (!$this->context)
-		{
 			$this->context = Context::getContext();
-			$this->setMedia();
-		}
 
 		$this->context->smarty->assign(array(
 			'HOOK_RIGHT_COLUMN' => Module::hookExec('rightColumn', array('cart' => $this->context->cart)),

footer.php

@@ -24,5 +24,10 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  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();

header.php

@@ -25,6 +25,10 @@
 *  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();
 

modules/favoriteproducts/favoriteproducts-account.php

@@ -38,9 +38,9 @@ if (!Context::getContext()->cookie->isLogged())
 	
 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');
 }