valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

queryFeedHeadlines: properly define for a few more variables

This commit is contained in:
Andrew Dolgov 2020-12-04 08:59:37 +03:00
parent 1580748c17
commit 20af8d5caf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
classes/feeds.php
View File

@ -1647,6 +1647,11 @@ class Feeds extends Handler_Protected {
$vfeed_query_part = $override_vfeed; $vfeed_query_part = $override_vfeed;
} }
$feed_title = "";
$feed_site_url = "";
$last_error = "";
$last_updated = "";
if ($search) { if ($search) {
$feed_title = T_sprintf("Search results: %s", $search); $feed_title = T_sprintf("Search results: %s", $search);
} else { } else {
@ -1684,6 +1689,8 @@ class Feeds extends Handler_Protected {
$start_ts_query_part = ""; $start_ts_query_part = "";
} }
$first_id = 0;
if (is_numeric($feed)) { if (is_numeric($feed)) {
// proper override_order applied above // proper override_order applied above
if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) { 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) { if (!$allow_archived) {
$from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds"; $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"; $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
@ -1711,11 +1716,11 @@ class Feeds extends Handler_Protected {
} else { } else {
$from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id) $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)"; LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
$feed_check_qpart = "";
} }
if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,"; if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,";
$first_id = 0;
$first_id_query_strategy_part = $query_strategy_part; $first_id_query_strategy_part = $query_strategy_part;
if ($feed == -3) if ($feed == -3)