added $assoc and $depth parameters to TJavascript::jsonDecode()

1 files changed, 4 insertions, 2 deletions

diff --git a/framework/Web/Javascripts/TJavaScript.php b/framework/Web/Javascripts/TJavaScript.php
index 9a152a32..468182d2 100644
--- a/framework/Web/Javascripts/TJavaScript.php
+++ b/framework/Web/Javascripts/TJavaScript.php
@@ -228,11 +228,13 @@ class TJavaScript
 	 * Decodes a javascript string into PHP variable.

 	 * This method invokes json_decode to perform the decoding.

 	 * @param string string to be decoded

+	 * @param bool whether to convert returned objects to associative arrays

+	 * @param int recursion depth

 	 * @return mixed decoded variable

 	 */

-	public static function jsonDecode($value)

+	public static function jsonDecode($value, $assoc = false, $depth = 512)

 	{

-		$s= json_decode($value);

+		$s= json_decode($value, $assoc, $depth);

 		self::checkJsonError();

 		return $s;

 	}