// small fix for smarty pre-compile

This commit is contained in:
Rémi Gaillard committed 2013-01-14 11:05:42 +01:00
1 parent 60260c4757
commit f516409fc0
2 files changed
+4 -1

No files matched your search

+3
View File
@@ -145,6 +145,9 @@ class ConfigurationCore extends ObjectModel
*/ */
public static function get($key, $id_lang = null, $id_shop_group = null, $id_shop = null) 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 conf if not initialized, try manual query
if (!self::$_CONF) if (!self::$_CONF)
{ {
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA * 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 (Tools::getValue('bo'))
{ {
if (!is_dir(_PS_ROOT_DIR_.'/admin/')) if (!is_dir(_PS_ROOT_DIR_.'/admin/'))