From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Tue, 24 Jan 2017 12:11:13 +0000 (+0300)
Subject: fetch_file_contents: rework the way shim works to prevent intermittent warnings
X-Git-Tag: 17.4~77
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e934d63e0c226d1925e3be5de9e29dc2fb14618c;p=tt-rss.git

fetch_file_contents: rework the way shim works to prevent intermittent warnings
---

diff --git a/include/functions.php b/include/functions.php
index 30b9b293..46f55d4e 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -348,7 +348,16 @@
 		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),
@@ -357,7 +366,7 @@
 					"timeout" => @func_get_arg(5),
 					"timestamp" => @func_get_arg(6),
 					"useragent" => @func_get_arg(7)
-			);
+			); */
 		}
 
 		$url = $options["url"];