From f516409fc0428e33473093d08a3f4169c74bc6ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Mon, 14 Jan 2013 11:05:42 +0100 Subject: [PATCH] // small fix for smarty pre-compile --- classes/Configuration.php | 3 +++ install-dev/controllers/http/smarty_compile.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/Configuration.php b/classes/Configuration.php index 3353f442b..65cc3d8b4 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -145,6 +145,9 @@ class ConfigurationCore extends ObjectModel */ public static function get($key, $id_lang = null, $id_shop_group = null, $id_shop = null) { + if (defined('_PS_DO_NOT_LOAD_CONFIGURATION_') && _PS_DO_NOT_LOAD_CONFIGURATION_) + return false; + // If conf if not initialized, try manual query if (!self::$_CONF) { diff --git a/install-dev/controllers/http/smarty_compile.php b/install-dev/controllers/http/smarty_compile.php index d8ec92a58..e8374410c 100644 --- a/install-dev/controllers/http/smarty_compile.php +++ b/install-dev/controllers/http/smarty_compile.php @@ -24,7 +24,7 @@ * International Registered Trademark & Property of PrestaShop SA */ -require_once(_PS_ROOT_DIR_.'/config/settings.inc.php'); +define('_PS_DO_NOT_LOAD_CONFIGURATION_', true); if (Tools::getValue('bo')) { if (!is_dir(_PS_ROOT_DIR_.'/admin/'))