af_redditimgur: support video elements in imgur albums

[tt-rss.git] / include / rssfuncs.php

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 95ac4076f52af6461d18873cf4d84d8e56d2c09d..c01e703d18876bb9e6a4691c38e7b6c7b7aceb77 100755 (executable)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -193,9 +193,8 @@
                                ttrss_users.id = ttrss_user_prefs.owner_uid AND
                                ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
                                ttrss_user_prefs.profile IS NULL AND
-                               feed_url = '".db_escape_string($feed)."' AND
-                               (ttrss_feeds.update_interval > 0 OR
-                                       ttrss_user_prefs.value != '-1')
+                               feed_url = '".db_escape_string($feed)."'
+                               $update_limit_qpart
                                $login_thresh_qpart
                        ORDER BY ttrss_feeds.id $query_limit");
 
@@ -314,21 +313,15 @@
                        feed_url,auth_pass,cache_images,
                        mark_unread_on_update, owner_uid,
                        pubsub_state, auth_pass_encrypted,
-                       feed_language,
-                       (SELECT max(date_entered) FROM
-                               ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp
+                       feed_language
                        FROM ttrss_feeds WHERE id = '$feed'");
 
                if (db_num_rows($result) == 0) {
                        _debug("feed $feed NOT FOUND/SKIPPED", $debug_enabled);
+                       user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
                        return false;
                }
 
-               $last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
-
-               if (defined('_DISABLE_HTTP_304'))
-                       $last_article_timestamp = 0;
-
                $owner_uid = db_fetch_result($result, 0, "owner_uid");
                $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
                        0, "mark_unread_on_update"));
@@ -372,9 +365,10 @@
                        $rss_hash = false;
 
                        $force_refetch = isset($_REQUEST["force_refetch"]);
+                       $feed_data = "";
 
                        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-                               $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass);
+                               $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
                        }
 
                        // try cache
@@ -404,12 +398,10 @@
                                        _debug("not using CURL due to open_basedir restrictions");
                                }
 
-                               _debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
-
                                $feed_data = fetch_file_contents($fetch_url, false,
                                        $auth_login, $auth_pass, false,
                                        $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-                                       $force_refetch ? 0 : $last_article_timestamp);
+                                       0);
 
                                global $fetch_curl_used;