Check PHP version before calling json_decode with $options parameter

kemo · Apr 2, 2012 · 3a7438e · 3a7438e
1 parent c699710
commit 3a7438e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/classes/Kohana/JSend.php b/classes/Kohana/JSend.php
@@ -72,7 +72,9 @@ public static function decode($json, $assoc = NULL, $depth = NULL, $options = NU
 			$options = JSend::DEFAULT_OPTIONS;
 		}
 
-		$result = json_decode($json, $assoc, $depth, $options);
+		$result = version_compare(PHP_VERSION, '5.4') < 0
+			? json_decode($json, $assoc, $depth, $options)
+			: json_decode($json, $assoc, $depth);
 
 		return JSend::check_json_errors($result);
 	}