diff options
Diffstat (limited to 'app/class/Flywheel/Formatter/JSON.php')
-rw-r--r-- | app/class/Flywheel/Formatter/JSON.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/class/Flywheel/Formatter/JSON.php b/app/class/Flywheel/Formatter/JSON.php index d55c3b6..108c756 100644 --- a/app/class/Flywheel/Formatter/JSON.php +++ b/app/class/Flywheel/Formatter/JSON.php @@ -10,13 +10,11 @@ class JSON implements \JamesMoss\Flywheel\Formatter\FormatInterface } public function encode(array $data) { - $options = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : null; - $options .= JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE; + $options = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE : null; return json_encode($data, $options); } public function decode($data) { - $options = defined('JSON_OBJECT_AS_ARRAY') ? JSON_OBJECT_AS_ARRAY : null; - return json_decode($data, $options); + return json_decode($data, true); } } |