diff --git a/config/config.inc.php b/config/config.inc.php index 9e1213239..5e56da050 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -25,24 +25,9 @@ * International Registered Trademark & Property of PrestaShop SA */ -/* Debug only */ -define('_PS_MODE_DEV_', true); -if (_PS_MODE_DEV_) -{ - @ini_set('display_errors', 'on'); - define('_PS_DEBUG_SQL_', true); -} -else -{ - @ini_set('display_errors', 'off'); - define('_PS_DEBUG_SQL_', false); -} - +require_once(dirname(__FILE__).'/defines.inc.php'); $start_time = microtime(true); -/* Compatibility warning */ -define('_PS_DISPLAY_COMPATIBILITY_WARNING_', true); - /* SSL configuration */ define('_PS_SSL_PORT_', 443); @@ -66,7 +51,7 @@ if (!file_exists(dirname(__FILE__).'/settings.inc.php')) } require_once(dirname(__FILE__).'/settings.inc.php'); -require_once(dirname(__FILE__).'/defines.inc.php'); + require_once(dirname(__FILE__).'/autoload.php'); if (_PS_DEBUG_PROFILING_) diff --git a/config/defines.inc.php b/config/defines.inc.php index 6bb0406fc..3fcd253c7 100755 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -25,6 +25,23 @@ * International Registered Trademark & Property of PrestaShop SA */ +/* Debug only */ +define('_PS_MODE_DEV_', true); +if (_PS_MODE_DEV_) +{ + @ini_set('display_errors', 'on'); + define('_PS_DEBUG_SQL_', true); + /* Compatibility warning */ + define('_PS_DISPLAY_COMPATIBILITY_WARNING_', true); +} +else +{ + @ini_set('display_errors', 'off'); + define('_PS_DEBUG_SQL_', false); + /* Compatibility warning */ + define('_PS_DISPLAY_COMPATIBILITY_WARNING_', false); +} + define('_PS_DEBUG_PROFILING_', false); define('_PS_MODE_DEMO_', false);