From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 14:13:21 +0000 (+0400)
Subject: correctly report fetch error
X-Git-Tag: 1.7.9~25^2~118
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6122c449abae6d6dfa5372580242b4abdf4d7a97;p=tt-rss.git

correctly report fetch error
---

diff --git a/include/functions.php b/include/functions.php
index 615f0a9b..e861193c 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -402,6 +402,8 @@
 				$context = NULL;
 			}
 
+			$old_error = error_get_last();
+
 			$data = @file_get_contents($url, false, $context);
 
 			$fetch_last_content_type = false;  // reset if no type was sent from server
@@ -419,9 +421,14 @@
 				}
 			}
 
-			if (!$data && function_exists('error_get_last')) {
+			if (!$data) {
 				$error = error_get_last();
-				$fetch_last_error = $error["message"];
+
+				if ($error['message'] != $old_error['message']) {
+					$fetch_last_error = $error["message"];
+				} else {
+					$fetch_last_error = "HTTP Code: $fetch_last_error_code";
+				}
 			}
 			return $data;
 		}