API CHANGE Removed Services_JSON library, as we use the built-in json…

… functions instead.
silverstripe · Mar 31, 2012 · dbc4be3 · dbc4be3
1 parent 8ae474b
commit dbc4be3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1,357 deletions.
diff --git a/core/Convert.php b/core/Convert.php
@@ -143,7 +143,7 @@ static function xml2raw($val) {
 	 * Convert a JSON encoded string into an object.
 	 *
 	 * @param string $val
-	 * @return mixed
+	 * @return object|boolean
 	 */
 	static function json2obj($val) {
 		return json_decode($val);

diff --git a/thirdparty/json/.piston.yml b/thirdparty/json/.piston.yml