// Remove unused overrides, move FirePHP to tools/FirePHP folder and profiling classes to tools/profiling/ folder

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14733 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-04-18 14:12:24 +00:00
parent bb17c175d6
commit b686e7f839
15 changed files with 29 additions and 35 deletions
+4 -4
View File
@@ -62,10 +62,10 @@ require_once(dirname(__FILE__).'/autoload.php');
if (_PS_DEBUG_PROFILING_)
{
include_once(_PS_ROOT_DIR_.'/override/classes/controller/_Controller.php');
include_once(_PS_ROOT_DIR_.'/override/classes/_ObjectModel.php');
include_once(_PS_ROOT_DIR_.'/override/classes/_Hook.php');
include_once(_PS_ROOT_DIR_.'/override/classes/db/_Db.php');
include_once(_PS_TOOL_DIR_.'profiling/Controller.php');
include_once(_PS_TOOL_DIR_.'profiling/ObjectModel.php');
include_once(_PS_TOOL_DIR_.'profiling/Hook.php');
include_once(_PS_TOOL_DIR_.'profiling/Db.php');
}
/* Redefine REQUEST_URI if empty (on some webservers...) */
+1 -1
View File
@@ -26,7 +26,7 @@
*/
define('_PS_MODE_DEV_', true);
define('_PS_DEBUG_PROFILING_', false);
define('_PS_DEBUG_PROFILING_', true);
define('_PS_MODE_DEMO_', false);
$currentDir = dirname(__FILE__);
-7
View File
@@ -1,7 +0,0 @@
<?php
class SubDomain extends SubDomainCore
{
}
+2 -2
View File
@@ -32,11 +32,11 @@
// if FB class is already loaded, just enable it. else, enable it only if fb.php exists and is loaded
if (!defined('PS_USE_FIREPHP') AND class_exists('FB'))
define('PS_USE_FIREPHP',true);
elseif (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php'))
elseif (file_exists(_PS_TOOL_DIR_.'FirePHP/fb.php'))
{
if (!defined('PS_USE_FIREPHP'))
{
require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php');
require_once(_PS_TOOL_DIR_.'FirePHP/fb.php');
define('PS_USE_FIREPHP',true);
}
else
@@ -1,7 +0,0 @@
<?php
class AdminAddonsMyAccountController extends AdminAddonsMyAccountControllerCore
{
}
@@ -1,7 +0,0 @@
<?php
class AdminStatsConfController extends AdminStatsConfControllerCore
{
}
@@ -1,7 +0,0 @@
<?php
class AdminSubDomainsController extends AdminSubDomainsControllerCore
{
}
+11
View File
@@ -0,0 +1,11 @@
<?php
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;
+11
View File
@@ -0,0 +1,11 @@
<?php
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;