Merge pull request #8934 from annando/fix-fatal

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index feed85e211ba52836a42e00010351ed034233102..8b2c2d500516326108b5c2d61527be6e0ad272a1 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -48,7 +48,7 @@ class System
                $previous = ['class' => '', 'function' => '', 'database' => false];
 
                // The ignore list contains all functions that are only wrapper functions
-               $ignore = ['fetchUrl', 'call_user_func_array'];
+               $ignore = ['call_user_func_array'];
 
                while ($func = array_pop($trace)) {
                        if (!empty($func['class'])) {
@@ -136,12 +136,13 @@ class System
         * and adds an application/json HTTP header to the output.
         * After finishing the process is getting killed.
         *
-        * @param mixed  $x The input content.
-        * @param string $content_type Type of the input (Default: 'application/json').
+        * @param mixed   $x The input content.
+        * @param string  $content_type Type of the input (Default: 'application/json').
+        * @param integer $options JSON options
         */
-       public static function jsonExit($x, $content_type = 'application/json') {
+       public static function jsonExit($x, $content_type = 'application/json', int $options = 0) {
                header("Content-type: $content_type");
-               echo json_encode($x);
+               echo json_encode($x, $options);
                exit();
        }