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

// Add override debug in BO too

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10748 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-11-29 15:44:53 +00:00
parent 31bf5b5864
commit 9c7bc59954
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
override/classes/_FrontController.php → override/classes/_Controller.php
Executable → Regular
+6 -9
View File
@@ -20,7 +20,7 @@
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 6844 $
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
@@ -81,8 +81,7 @@ function developpementErrorHandler($errno, $errstr, $errfile, $errline)
return true;
}
class FrontController extends FrontControllerCore
abstract class Controller extends ControllerCore
{
public $_memory = array();
public $_time = array();
@@ -170,9 +169,6 @@ class FrontController extends FrontControllerCore
$this->_memory = array_fill(0, 10, 0);
$this->_time = array_fill(0, 10, 0);
// Usually set in the parent constructor, but here I need it to evaluate init()
$useSSL = $this->ssl;
if (!self::$_footer)
return;
@@ -222,7 +218,7 @@ class FrontController extends FrontControllerCore
if ($this->ajax && method_exists($this, 'displayAjax'))
$this->displayAjax();
else
$this->display();
$this->displayDebug();
}
function ini_get_display_errors()
@@ -251,11 +247,11 @@ class FrontController extends FrontControllerCore
return $size;
}
public function display()
public function displayDebug()
{
global $start_time;
parent::display();
$this->display();
if (self::$_footer)
parent::displayFooter();
@@ -402,3 +398,4 @@ class FrontController extends FrontControllerCore
}
}
}
override/classes/_ObjectModel.php
+29
View File
@@ -1,4 +1,33 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
//
// IMPORTANT : don't forget to delete the underscore _ in the file name if you want to use it !
//
abstract class ObjectModel extends ObjectModelCore
{