Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed CompiledJsonFile as it was not caching properly

Browse Source
This commit is contained in:
Andy Miller 2016-11-04 06:47:27 -06:00
parent e73773672b
commit 491e73eade
No known key found for this signature in database
GPG Key ID: EC184FEE178C8ACB
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/src/Grav/Common/File/CompiledJsonFile.php
View File

@ -14,19 +14,15 @@ class CompiledJsonFile extends JsonFile
{
use CompiledFile;
public function content($var = null, $assoc = false)
/**
* Decode RAW string into contents.
*
* @param string $var
* @param bool $assoc
* @return array mixed
*/
protected function decode($var, $assoc = true)
{
if ($var !== null) {
$this->content = $this->check($var);
// Update RAW, too.
$this->raw = $this->encode($this->content);
} elseif ($this->content === null) {
// Decode RAW file.
$this->content = $this->decode($this->raw(), $assoc);
}
return $this->content;
return (array) json_decode($var, $assoc);
}
}