From 20af8d5caf288ea7326c46b9f81dc6027291b2fc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 4 Dec 2020 08:59:37 +0300 Subject: queryFeedHeadlines: properly define for a few more variables --- classes/feeds.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index b75757b65..f985070cb 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -1647,6 +1647,11 @@ class Feeds extends Handler_Protected { $vfeed_query_part = $override_vfeed; } + $feed_title = ""; + $feed_site_url = ""; + $last_error = ""; + $last_updated = ""; + if ($search) { $feed_title = T_sprintf("Search results: %s", $search); } else { @@ -1684,6 +1689,8 @@ class Feeds extends Handler_Protected { $start_ts_query_part = ""; } + $first_id = 0; + if (is_numeric($feed)) { // proper override_order applied above if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) { @@ -1702,8 +1709,6 @@ class Feeds extends Handler_Protected { } } - $feed_check_qpart = ""; - if (!$allow_archived) { $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds"; $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND"; @@ -1711,11 +1716,11 @@ class Feeds extends Handler_Protected { } else { $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id) LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)"; + $feed_check_qpart = ""; } if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,"; - $first_id = 0; $first_id_query_strategy_part = $query_strategy_part; if ($feed == -3) -- cgit v1.2.3