From 6122c449abae6d6dfa5372580242b4abdf4d7a97 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 19 Apr 2013 18:13:21 +0400 Subject: correctly report fetch error --- include/functions.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'include/functions.php') diff --git a/include/functions.php b/include/functions.php index 615f0a9b7..e861193c2 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; } -- cgit v1.2.3