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

// fix uninitialized front controller

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7964 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-08-09 14:46:03 +00:00
parent 269121a9c4
commit 8d1435dfd0
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+7 -9
View File
@@ -56,7 +56,7 @@ class FrontControllerCore
protected $id_current_shop; protected $id_current_shop;
protected $id_current_group_shop; protected $id_current_group_shop;
public static $initialized = false; public $initialized = false;
protected static $currentCustomerGroups; protected static $currentCustomerGroups;
@@ -89,9 +89,9 @@ class FrontControllerCore
*/ */
global $cookie, $smarty, $cart, $iso, $defaultCountry, $protocol_link, $protocol_content, $link, $css_files, $js_files, $currency; global $cookie, $smarty, $cart, $iso, $defaultCountry, $protocol_link, $protocol_content, $link, $css_files, $js_files, $currency;
if (self::$initialized) if ($this->initialized)
return; return;
self::$initialized = true; $this->initialized = true;
$this->context = Context::getContext(); $this->context = Context::getContext();
@@ -502,7 +502,7 @@ class FrontControllerCore
public function displayHeader() public function displayHeader()
{ {
if (!self::$initialized) if (!$this->initialized)
$this->init(); $this->init();
// 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"');
@@ -542,9 +542,7 @@ class FrontControllerCore
public function displayFooter() public function displayFooter()
{ {
if (!$this->context) if (!$this->initialized)
$this->context = Context::getContext();
if (!self::$initialized)
$this->init(); $this->init();
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
@@ -564,7 +562,7 @@ class FrontControllerCore
public function productSort() public function productSort()
{ {
if (!self::$initialized) if (!$this->initialized)
$this->init(); $this->init();
// $this->orderBy = Tools::getProductsOrder('by', Tools::getValue('orderby')); // $this->orderBy = Tools::getProductsOrder('by', Tools::getValue('orderby'));
@@ -594,7 +592,7 @@ class FrontControllerCore
public function pagination($nbProducts = 10) public function pagination($nbProducts = 10)
{ {
if (!self::$initialized) if (!$this->initialized)
$this->init(); $this->init();
$nArray = (int)(Configuration::get('PS_PRODUCTS_PER_PAGE')) != 10 ? array((int)(Configuration::get('PS_PRODUCTS_PER_PAGE')), 10, 20, 50) : array(10, 20, 50); $nArray = (int)(Configuration::get('PS_PRODUCTS_PER_PAGE')) != 10 ? array((int)(Configuration::get('PS_PRODUCTS_PER_PAGE')), 10, 20, 50) : array(10, 20, 50);