From 07d2d348dc92198d8c8312f626f385e9625d941f Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 10 Sep 2012 14:16:00 +0000 Subject: [PATCH] // Fix PSCFV-3967 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17270 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/upgrade/upgrade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/install-dev/upgrade/upgrade.php b/install-dev/upgrade/upgrade.php index a70d2f33a..89ce4a9a2 100644 --- a/install-dev/upgrade/upgrade.php +++ b/install-dev/upgrade/upgrade.php @@ -204,6 +204,13 @@ require_once(_PS_INSTALL_PATH_.'upgrade/classes/AddConfToFile.php'); $oldLevel = error_reporting(E_ALL); $mysqlEngine = (defined('_MYSQL_ENGINE_') ? _MYSQL_ENGINE_ : 'MyISAM'); + +if (defined('_PS_CACHING_SYSTEM_') AND _PS_CACHING_SYSTEM_ == 'CacheFS') + $cache_engine = 'CacheFs'; +elseif (defined('_PS_CACHING_SYSTEM_') AND _PS_CACHING_SYSTEM_ != 'CacheMemcache') + $cache_engine = _PS_CACHING_SYSTEM_; +else + $cache_engine = 'CacheMemcache'; $datas = array( array('_DB_SERVER_', _DB_SERVER_), array('_DB_NAME_', _DB_NAME_), @@ -211,7 +218,7 @@ $datas = array( array('_DB_PASSWD_', _DB_PASSWD_), array('_DB_PREFIX_', _DB_PREFIX_), array('_MYSQL_ENGINE_', $mysqlEngine), - array('_PS_CACHING_SYSTEM_', (defined('_PS_CACHING_SYSTEM_') AND _PS_CACHING_SYSTEM_ != 'CacheMemcache') ? _PS_CACHING_SYSTEM_ : 'CacheMemcache'), + array('_PS_CACHING_SYSTEM_', $cache_engine, array('_PS_CACHE_ENABLED_', defined('_PS_CACHE_ENABLED_') ? _PS_CACHE_ENABLED_ : '0'), array('_MEDIA_SERVER_1_', defined('_MEDIA_SERVER_1_') ? _MEDIA_SERVER_1_ : ''), array('_MEDIA_SERVER_2_', defined('_MEDIA_SERVER_2_') ? _MEDIA_SERVER_2_ : ''),