summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-04-27 13:08:43 +0300
committerAndrew Dolgov <[email protected]>2017-04-27 13:08:43 +0300
commit07d3431e287ac2565d70434612da8134d6312dc4 (patch)
treebcf46b3ce5bb04cef595f1d9b43223088831ff35 /include
parentf03aaf270c85c68353babcce82064172e6b72423 (diff)
update_rss_feed: minor code cleanup
Diffstat (limited to 'include')
-rw-r--r--include/rssfuncs.php18
1 files changed, 4 insertions, 14 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index ff46ac8a1..4fdd2843f 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -447,16 +447,8 @@
$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
}
- // set last update to now so if anything *simplepie* crashes later we won't be
- // continuously failing on the same feed
- //db_query("UPDATE ttrss_feeds SET last_updated = NOW() WHERE id = '$feed'");
-
- if (!$rss) {
- $rss = new FeedParser($feed_data);
- $rss->init();
- }
-
-// print_r($rss);
+ $rss = new FeedParser($feed_data);
+ $rss->init();
$feed = db_escape_string($feed);
@@ -858,11 +850,11 @@
if (db_num_rows($result) == 0) {
- _debug("base guid [$entry_guid] not found", $debug_enabled);
+ _debug("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", $debug_enabled);
// base post entry does not exist, create it
- $result = db_query(
+ db_query(
"INSERT INTO ttrss_entries
(title,
guid,
@@ -894,8 +886,6 @@
'$entry_language',
'$entry_author')");
- } else {
- $base_entry_id = db_fetch_result($result, 0, "id");
}
// now it should exist, if not - bad luck then