From beb8fff0be49ed503c9afb2ebf1fa021e6de7f31 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Thu, 22 Dec 2011 16:13:59 +0000 Subject: [PATCH] // report bugfix from 1.4 to 1.5 related to memcache git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11628 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminPerformanceController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php index b01f05a0a..29a36f70f 100644 --- a/controllers/admin/AdminPerformanceController.php +++ b/controllers/admin/AdminPerformanceController.php @@ -709,7 +709,7 @@ class AdminPerformanceControllerCore extends AdminController $this->_errors[] = Tools::displayError('To use CacheFS the directory').' '. realpath(_PS_CACHEFS_DIRECTORY_).' '.Tools::displayError('must be writable'); - if ($caching_system == 'CacheFs') + if ($caching_system == 'CacheFs' && $cache_active) { if (!($depth = Tools::getValue('ps_cache_fs_directory_depth'))) $this->_errors[] = Tools::displayError('Please set a directory depth'); @@ -720,6 +720,9 @@ class AdminPerformanceControllerCore extends AdminController Configuration::updateValue('PS_CACHEFS_DIRECTORY_DEPTH', (int)$depth); } } + else if($caching_system == 'MCached' && $cache_active && !_PS_CACHE_ENABLED_ && _PS_CACHING_SYSTEM_ == 'MCached') + Cache::getInstance()->flush(); + if (!count($this->_errors)) { $settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $settings);