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

// _frontController now work again

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8921 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-30 09:51:35 +00:00
parent 9e5832fb33
commit 3e1c4e426f
1 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
override/classes/_FrontController.php
+28 -7
View File
@@ -150,6 +150,8 @@ class FrontController extends FrontControllerCore
public function __construct() public function __construct()
{ {
parent::__construct();
// error management // error management
set_error_handler('developpementErrorHandler'); set_error_handler('developpementErrorHandler');
ini_set('html_errors', 'on'); ini_set('html_errors', 'on');
@@ -179,22 +181,39 @@ class FrontController extends FrontControllerCore
{ {
$this->_memory[0] = memory_get_usage(); $this->_memory[0] = memory_get_usage();
$this->_time[0] = microtime(true); $this->_time[0] = microtime(true);
$this->preProcess(); $this->init();
$this->_memory[1] = memory_get_usage(); $this->_memory[1] = memory_get_usage();
$this->_time[1] = microtime(true); $this->_time[1] = microtime(true);
$this->setMedia(); if ($this->ajax && method_exists($this, 'ajaxProcess'))
$this->ajaxProcess();
else
$this->postProcess();
$this->_memory[2] = memory_get_usage(); $this->_memory[2] = memory_get_usage();
$this->_time[2] = microtime(true); $this->_time[2] = microtime(true);
$this->displayHeader(); if ($this->displayHeader)
{
$this->setMedia();
$this->initHeader();
}
$this->_memory[3] = memory_get_usage(); $this->_memory[3] = memory_get_usage();
$this->_time[3] = microtime(true); $this->_time[3] = microtime(true);
$this->process(); $this->initContent();
$this->_memory[4] = memory_get_usage(); $this->_memory[4] = memory_get_usage();
$this->_time[4] = microtime(true); $this->_time[4] = microtime(true);
$this->displayContent(); if ($this->displayFooter)
$this->initFooter();
$this->_memory[5] = memory_get_usage(); $this->_memory[5] = memory_get_usage();
$this->_time[5] = microtime(true); $this->_time[5] = microtime(true);
$this->displayFooter(); if ($this->ajax && method_exists($this, 'displayAjax'))
$this->displayAjax();
else
$this->display();
} }
function ini_get_display_errors() function ini_get_display_errors()
@@ -223,10 +242,12 @@ class FrontController extends FrontControllerCore
return $size; return $size;
} }
public function displayFooter() public function display()
{ {
global $start_time; global $start_time;
parent::display();
if (self::$_footer) if (self::$_footer)
parent::displayFooter(); parent::displayFooter();