// Add missing call of parent::initContent() in all front class (when initContent exists)

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

controllers/front/AddressController.php

@@ -285,6 +285,7 @@ class AddressControllerCore extends FrontController
 		}
 
 		$this->setTemplate(_PS_THEME_DIR_.'address.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/AddressesController.php

@@ -102,6 +102,7 @@ class AddressesControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'addresses.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/AuthController.php

@@ -146,6 +146,7 @@ class AuthControllerCore extends FrontController
 			die(Tools::jsonEncode($return));
 		}
 		$this->setTemplate(_PS_THEME_DIR_.'authentication.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/BestSalesController.php

@@ -43,6 +43,7 @@ class BestSalesControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'best-sales.tpl');
+		parent::initContent();
 	}
 
 	public function setMedia()

controllers/front/CartController.php

@@ -249,6 +249,7 @@ class CartControllerCore extends FrontController
 	public function initContent()
 	{
 		$this->setTemplate(_PS_THEME_DIR_.'errors.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/CategoryController.php

@@ -111,6 +111,7 @@ class CategoryControllerCore extends FrontController
 
 
 		$this->setTemplate(_PS_THEME_DIR_.'category.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/CmsController.php

@@ -107,5 +107,6 @@ class CmsControllerCore extends FrontController
 		}
 
 		$this->setTemplate(_PS_THEME_DIR_.'cms.tpl');
+		parent::initContent();
 	}
 }

controllers/front/CompareController.php

@@ -153,6 +153,7 @@ class CompareControllerCore extends FrontController
 		$this->context->smarty->assign('hasProduct', $hasProduct);
 
 		$this->setTemplate(_PS_THEME_DIR_.'products-comparison.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/ContactController.php

@@ -220,6 +220,7 @@ class ContactControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'contact-form.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/DiscountController.php

@@ -46,6 +46,7 @@ class DiscountControllerCore extends FrontController
 
 		$this->context->smarty->assign(array('nbDiscounts' => (int)($nbDiscounts), 'discount' => $discounts));
 		$this->setTemplate(_PS_THEME_DIR_.'discount.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/GuestTrackingController.php

@@ -105,6 +105,7 @@ class GuestTrackingControllerCore extends FrontController
 			'errors' => $this->errors,
 		));
 		$this->setTemplate(_PS_THEME_DIR_.'guest-tracking.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/HistoryController.php

@@ -64,6 +64,7 @@ class HistoryControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'history.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/IdentityController.php

@@ -136,6 +136,7 @@ class IdentityControllerCore extends FrontController
 		$this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active);
 
 		$this->setTemplate(_PS_THEME_DIR_.'identity.tpl');
+		parent::initContent();
 	}
 
 	public function setMedia()

controllers/front/IndexController.php

@@ -35,7 +35,8 @@ class IndexControllerCore extends FrontController
 	 */
 	public function initContent()
 	{
-		$this->context->smarty->assign('HOOK_HOME', Hook::exec('home'));
+		$this->context->smarty->assign('HOOK_HOME', Hook::exec('displayHome'));
 		$this->setTemplate(_PS_THEME_DIR_.'index.tpl');
+		parent::initContent();
 	}
 }

controllers/front/ManufacturerController.php

@@ -81,6 +81,7 @@ class ManufacturerControllerCore extends FrontController
 			$this->assignAll();
 			$this->setTemplate(_PS_THEME_DIR_.'manufacturer-list.tpl');
 		}
+		parent::initContent();
 	}
 
 	/**

controllers/front/ModuleController.php

@@ -58,5 +58,6 @@ class ModuleControllerCore extends FrontController
 			$this->setTemplate($module->$method());
 		else
 			die('Module action not found');
+		parent::initContent();
 	}
 }

controllers/front/MyAccountController.php

@@ -51,6 +51,7 @@ class MyAccountControllerCore extends FrontController
 		$this->context->smarty->assign('HOOK_CUSTOMER_ACCOUNT', Hook::exec('customerAccount'));
 
 		$this->setTemplate(_PS_THEME_DIR_.'my-account.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/NewProductsController.php

@@ -60,6 +60,7 @@ class NewProductsControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'new-products.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/OrderConfirmationController.php

@@ -87,6 +87,7 @@ class OrderConfirmationControllerCore extends FrontController
 		}
 
 		$this->setTemplate(_PS_THEME_DIR_.'order-confirmation.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/OrderController.php

@@ -161,6 +161,7 @@ class OrderControllerCore extends ParentOrderController
 			'currencyFormat' => $this->context->currency->format,
 			'currencyBlank' => $this->context->currency->blank,
 		));
+		parent::initContent();
 	}
 
 	private function processAddressFormat()

controllers/front/OrderDetailController.php

@@ -203,6 +203,7 @@ class OrderDetailControllerCore extends FrontController
 		}
 
 		$this->setTemplate(_PS_THEME_DIR_.'order-detail.tpl');
+		parent::initContent();
 	}
 
 	public function setMedia()

controllers/front/OrderFollowController.php

@@ -93,6 +93,7 @@ class OrderFollowControllerCore extends FrontController
 		$this->context->smarty->assign('ordersReturn', $ordersReturn);
 
 		$this->setTemplate(_PS_THEME_DIR_.'order-follow.tpl');
+		parent::initContent();
 	}
 
 	public function setMedia()

controllers/front/OrderOpcController.php

@@ -315,6 +315,7 @@ class OrderOpcControllerCore extends ParentOrderController
 
 		$this->_processAddressFormat();
 		$this->setTemplate(_PS_THEME_DIR_.'order-opc.tpl');
+		parent::initContent();
 	}
 
 	protected function _getGuestInformations()

controllers/front/OrderReturnController.php

@@ -83,6 +83,7 @@ class OrderReturnControllerCore extends FrontController
 			'nbdaysreturn' => (int)(Configuration::get('PS_ORDER_RETURN_NB_DAYS'))
 		));
 		$this->setTemplate(_PS_THEME_DIR_.'order-return.tpl');
+		parent::initContent();
 	}
 
 	public function displayAjax()

controllers/front/OrderSlipController.php

@@ -49,6 +49,7 @@ class OrderSlipControllerCore extends FrontController
 	{
 		$this->context->smarty->assign('ordersSlip', OrderSlip::getOrdersSlip((int)$this->context->cookie->id_customer));
 		$this->setTemplate(_PS_THEME_DIR_.'order-slip.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/PageNotFoundController.php

@@ -36,6 +36,7 @@ class PageNotFoundControllerCore extends FrontController
 	public function initContent()
 	{
 		$this->setTemplate(_PS_THEME_DIR_.'404.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/PasswordController.php

@@ -111,6 +111,7 @@ class PasswordControllerCore extends FrontController
 	public function initContent()
 	{
 		$this->setTemplate(_PS_THEME_DIR_.'password.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/PricesDropController.php

@@ -53,6 +53,7 @@ class PricesDropControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'prices-drop.tpl');
+		parent::initContent();
 	}
 }
 

controllers/front/ProductController.php

@@ -199,6 +199,7 @@ class ProductControllerCore extends FrontController
 		$this->context->smarty->assign('errors', $this->errors);
 
 		$this->setTemplate(_PS_THEME_DIR_.'product.tpl');
+		parent::initContent();
 	}
 
 	/**

controllers/front/SearchController.php

@@ -115,6 +115,7 @@ class SearchControllerCore extends FrontController
 		$this->context->smarty->assign('add_prod_display', Configuration::get('PS_ATTRIBUTE_CATEGORY_DISPLAY'));
 
 		$this->setTemplate(_PS_THEME_DIR_.'search.tpl');
+		parent::initContent();
 	}
 
 	public function displayHeader($display = true)

controllers/front/SitemapController.php

@@ -54,5 +54,6 @@ class SitemapControllerCore extends FrontController
 		$this->context->smarty->assign('display_store', Configuration::get('PS_STORES_DISPLAY_SITEMAP'));
 
 		$this->setTemplate(_PS_THEME_DIR_.'sitemap.tpl');
+		parent::initContent();
 	}
 }

controllers/front/StoresController.php

@@ -252,6 +252,7 @@ class StoresControllerCore extends FrontController
 		));
 
 		$this->setTemplate(_PS_THEME_DIR_.'stores.tpl');
+		parent::initContent();
 	}
 
 	public function setMedia()

controllers/front/SupplierController.php

@@ -83,6 +83,7 @@ class SupplierControllerCore extends FrontController
 			$this->assignAll();
 			$this->setTemplate(_PS_THEME_DIR_.'supplier-list.tpl');
 		}
+		parent::initContent();
 	}
 
 	/**