proper handling of JsonSerializable.

afa72add · Qiang Xue · 7fa18c54 · afa72add
Commit afa72add authored Jan 11, 2014 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

BaseJson.php framework/helpers/BaseJson.php +1 -1

No files found.
--- a/framework/helpers/BaseJson.php
+++ b/framework/helpers/BaseJson.php
@@ -82,7 +82,7 @@ class BaseJson
 	protected static function processData($data, &$expressions, $expPrefix)
 	{
 		if ($data instanceof \JsonSerializable) {
-			return $data;
+			$data = $data->jsonSerialize();
 		}

 		if (is_object($data)) {