// Fix bugs on frontControllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8815 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
3d36012cb9
commit
8a4660a378
2 files changed
+8
-8
No files matched your search
@@ -92,7 +92,7 @@ class FrontControllerCore extends Controller
|
|||||||
$this->displayHeader(false);
|
$this->displayHeader(false);
|
||||||
$this->displayFooter(false);
|
$this->displayFooter(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
ob_start();
|
ob_start();
|
||||||
|
|
||||||
// Switch language if needed and init cookie language
|
// Switch language if needed and init cookie language
|
||||||
@@ -353,7 +353,7 @@ class FrontControllerCore extends Controller
|
|||||||
$this->preProcess();
|
$this->preProcess();
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
//$this->preProcess();
|
//$this->preProcess();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -362,6 +362,11 @@ class FrontControllerCore extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function initContent()
|
public function initContent()
|
||||||
|
{
|
||||||
|
$this->process();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function process()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,12 +43,6 @@ class CategoryControllerCore extends FrontController
|
|||||||
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
|
$this->addJS(_THEME_JS_DIR_.'products-comparison.js');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function displayHeader($display = true)
|
|
||||||
{
|
|
||||||
parent::displayHeader();
|
|
||||||
$this->productSort();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function canonicalRedirection($canonicalURL = '')
|
public function canonicalRedirection($canonicalURL = '')
|
||||||
{
|
{
|
||||||
if (!Tools::getValue('noredirect') && Validate::isLoadedObject($this->category))
|
if (!Tools::getValue('noredirect') && Validate::isLoadedObject($this->category))
|
||||||
@@ -143,6 +137,7 @@ class CategoryControllerCore extends FrontController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->productSort();
|
||||||
$this->context->smarty->assign(array(
|
$this->context->smarty->assign(array(
|
||||||
'allow_oosp' => (int)(Configuration::get('PS_ORDER_OUT_OF_STOCK')),
|
'allow_oosp' => (int)(Configuration::get('PS_ORDER_OUT_OF_STOCK')),
|
||||||
'comparator_max_item' => (int)(Configuration::get('PS_COMPARATOR_MAX_ITEM')),
|
'comparator_max_item' => (int)(Configuration::get('PS_COMPARATOR_MAX_ITEM')),
|
||||||
|
|||||||
Reference in new issue
Block a user