tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.6' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2017-07-19 15:41:21 +01:00
commit 016e0e657a
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cache/Cache.php vendored
View File

@ -174,7 +174,9 @@ class SS_Cache {
$backend = self::$backends[$backend_name]; $backend = self::$backends[$backend_name];
$basicOptions = array('cache_id_prefix' => $for); $basicOptions = array(
'cache_id_prefix' => md5(BASE_PATH) . '_' . $for . '_',
);
if ($cache_lifetime >= 0) { if ($cache_lifetime >= 0) {
$basicOptions['lifetime'] = $cache_lifetime; $basicOptions['lifetime'] = $cache_lifetime;

3
core/manifest/ConfigManifest.php
View File

@ -115,7 +115,8 @@ class SS_ConfigManifest {
{ {
return SS_Cache::factory('SS_Configuration', 'Core', array( return SS_Cache::factory('SS_Configuration', 'Core', array(
'automatic_serialization' => true, 'automatic_serialization' => true,
'lifetime' => null 'lifetime' => null,
'cache_id_prefix' => 'SS_Configuration_',
)); ));
} }