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

Solved json obj to array issue
silverstripe · Mar 28, 2013 · 05181fc · 05181fc
2 parents 469eaee + 93428bd
commit 05181fc
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -1413,7 +1413,11 @@ public function CMSVersion() {
 			$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 @@ public function CMSVersion() {
 				}
 			}
 		} 
-
+		
 		// Fall back to static version file
 		foreach($modules as $moduleName => $moduleSpec) {
 			if(!isset($versions[$moduleName])) {