dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// report bugfix from 1.4 to 1.5 related to memcache

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11628 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-12-22 16:13:59 +00:00
parent 8d69864933
commit beb8fff0be
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminPerformanceController.php
+4 -1
View File
@@ -709,7 +709,7 @@ class AdminPerformanceControllerCore extends AdminController
$this->_errors[] = Tools::displayError('To use CacheFS the directory').' '. $this->_errors[] = Tools::displayError('To use CacheFS the directory').' '.
realpath(_PS_CACHEFS_DIRECTORY_).' '.Tools::displayError('must be writable'); 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'))) if (!($depth = Tools::getValue('ps_cache_fs_directory_depth')))
$this->_errors[] = Tools::displayError('Please set a 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); 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)) if (!count($this->_errors))
{ {
$settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $settings); $settings = preg_replace('/define\(\'_PS_CACHE_ENABLED_\', \'([0-9])\'\);/Ui', 'define(\'_PS_CACHE_ENABLED_\', \''.(int)$cache_active.'\');', $settings);