Permalink
Browse files

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

… functions instead.
  • Loading branch information...
1 parent 8ae474b commit dbc4be3e94aad6dc0097ba46640278cfb75f4bf4 @halkyon halkyon committed with halkyon Mar 30, 2012
Showing with 1 addition and 1,357 deletions.
  1. +1 −1 core/Convert.php
  2. +0 −8 thirdparty/json/.piston.yml
  3. +0 −806 thirdparty/json/JSON.php
  4. +0 −21 thirdparty/json/LICENSE
  5. +0 −521 thirdparty/json/Test-JSON.php
View
@@ -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);
@@ -1,8 +0,0 @@
----
-format: 1
-handler:
- piston:remote-revision: 93520
- piston:uuid: 467b73ca-7a2a-4603-9d3b-597d59a354a9
-lock: false
-repository_class: Piston::Svn::Repository
-repository_url: http://svn.silverstripe.com/open/thirdparty/json/tags/1.31
Oops, something went wrong.

0 comments on commit dbc4be3

Please sign in to comment.