Merge pull request ZoneMinder#256 from Phhere/patch-1

Fix checkJsonError messages
justinlawrence · Dec 4, 2013 · 5a256eb · 5a256eb
2 parents 219ada8 + d4babd2
commit 5a256eb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/web/includes/functions.php b/web/includes/functions.php
@@ -2225,10 +2225,11 @@ function isVector ( &$array )
     return( true );
 }
 
-function checkJsonError()
+function checkJsonError($value)
 {
     if ( function_exists('json_last_error') )
     {
+        $value = var_export($value,true);
         switch( json_last_error() )
         {
             case JSON_ERROR_DEPTH :
@@ -2252,7 +2253,7 @@ function jsonEncode( &$value )
     if ( function_exists('json_encode') )
     {
         $string = json_encode( $value );
-        checkJsonError();
+        checkJsonError($value);
         return( $string );
     }
 
@@ -2293,7 +2294,7 @@ function jsonDecode( $value )
     if ( function_exists('json_decode') )
     {
         $object = json_decode( $value, true );
-        checkJsonError();
+        checkJsonError($value);
         return( $object );
     }