summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-10-29 12:15:26 +0400
committerAndrew Dolgov <[email protected]>2013-10-29 12:15:26 +0400
commit4ad04ee227dd7d704f417aaf9d6762f5cfdf4c1f (patch)
tree0aeb03dc1fe1d04cf372de8e8263416f893d292c /include
parent88edaa9344dec86ab1e09dd2113b003c99d0d048 (diff)
report all libxml errors in updater debug output
force utf8 encoding if devforceupdate is on parser: try to convert non-unicode feeds with specified encoding to utf8 before trying to remove dangling utf8 characters in case of utf8-related libxml errors because doing so produces garbage content
Diffstat (limited to 'include')
-rw-r--r--include/rssfuncs.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bfbec0919..bc6048217 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1110,7 +1110,13 @@
$error_msg = db_escape_string(mb_substr($rss->error(), 0, 245));
- _debug("error fetching feed: $error_msg", $debug_enabled);
+ _debug("fetch error: $error_msg", $debug_enabled);
+
+ if (count($rss->errors()) > 1) {
+ foreach ($rss->errors() as $error) {
+ _debug("+ $error");
+ }
+ }
db_query(
"UPDATE ttrss_feeds SET last_error = '$error_msg',