Commit 4119bff21bf7d51fb311b58a5b92bb7c46d95ad5

Authored by Jarrett Jordaan
2 parents 1b952d6a 11bf483c

Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

webservice/clienttools/jsonWrapper.php
@@ -91,7 +91,7 @@ class jsonWrapper{ @@ -91,7 +91,7 @@ class jsonWrapper{
91 public $jsonArray=array(); 91 public $jsonArray=array();
92 92
93 public function __construct($content=NULL){ 93 public function __construct($content=NULL){
94 - $content=stripslashes($content); 94 +// $content=stripslashes($content);
95 $this->raw=$content; 95 $this->raw=$content;
96 $content=@json_decode($content,true); 96 $content=@json_decode($content,true);
97 if(!is_array($content))throw new jsonContentException('Invalid JSON input',jsonContentException::INPUT_ERROR); 97 if(!is_array($content))throw new jsonContentException('Invalid JSON input',jsonContentException::INPUT_ERROR);