]> git.wh0rd.org - tt-rss.git/commitdiff
fetch_file_contents: rework the way shim works to prevent intermittent warnings
authorAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Tue, 24 Jan 2017 12:11:13 +0000 (15:11 +0300)
committerAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Tue, 24 Jan 2017 12:11:13 +0000 (15:11 +0300)
include/functions.php

index 30b9b293a9e33a75a61b169899350071ef49541a..46f55d4e2068fa9ca1d510d0f3e9e4924033eafc 100644 (file)
                if (!is_array($options)) {
 
                        // falling back on compatibility shim
-                       $options = array(
+                       $option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "timestamp", "useragent" ];
+                       $tmp = [];
+
+                       for ($i = 0; $i < func_num_args(); $i++) {
+                               $tmp[$option_names[$i]] = func_get_arg($i);
+                       }
+
+                       $options = $tmp;
+
+                       /*$options = array(
                                        "url" => func_get_arg(0),
                                        "type" => @func_get_arg(1),
                                        "login" => @func_get_arg(2),
                                        "timeout" => @func_get_arg(5),
                                        "timestamp" => @func_get_arg(6),
                                        "useragent" => @func_get_arg(7)
-                       );
+                       ); */
                }
 
                $url = $options["url"];