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

Merge pull request #1344 from g4b0/8330-cache-issue-in-CMSVersion

Browse Source 
Solved json obj to array issue
This commit is contained in:
Ingo Schommer 2013-03-28 06:54:12 -07:00
commit 05181fce78
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/code/LeftAndMain.php
View File

@ -1413,7 +1413,11 @@ class LeftAndMain extends Controller implements PermissionProvider {
$cache = SS_Cache::factory('LeftAndMain_CMSVersion');
$cacheKey = filemtime($composerLockPath);
$versions = $cache->load($cacheKey);
if(!$versions) $versions = array();
if($versions) {
$versions = json_decode($versions, true);
} else {
$versions = array();
}
if(!$versions && $jsonData = file_get_contents($composerLockPath)) {
$lockData = json_decode($jsonData);
if($lockData && isset($lockData->packages)) {
@ -1429,7 +1433,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
}
}
}
// Fall back to static version file
foreach($modules as $moduleName => $moduleSpec) {
if(!isset($versions[$moduleName])) {