diff options
| -rw-r--r-- | CONTRIBUTING.md | 7 | ||||
| -rwxr-xr-x | classes/feeds.php | 5 | ||||
| -rwxr-xr-x | js/Headlines.js | 3 | ||||
| -rwxr-xr-x | update.php | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15bbce724..222630ece 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,12 @@ TLDR: it works pretty much like Github. 1. Make an account on Gogs -2. Fork the repository you're interested in +2. Fork the repository you're interested in (also see below) 3. Do the needful 4. File a pull request with your changes against master branch. +**If you can't fork the repository on Gogs, please see this forum thread:** + +https://discourse.tt-rss.org/t/pull-requests-gogs-spam/1850/2 + + diff --git a/classes/feeds.php b/classes/feeds.php index 023fba81a..60ccdc2e7 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -209,6 +209,7 @@ class Feeds extends Handler_Protected { make_local_datetime($qfh_ret[4], false) : __("Never"); $highlight_words = $qfh_ret[5]; $reply['first_id'] = $qfh_ret[6]; + $reply['is_vfeed'] = $qfh_ret[7]; $reply['search_query'] = [$search, $search_language]; $reply['vfeed_group_enabled'] = $vfeed_group_enabled; @@ -1748,7 +1749,7 @@ class Feeds extends Handler_Protected { $first_id = (int)$row["id"]; if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) { - return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); + return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != ""); } } } @@ -1837,7 +1838,7 @@ class Feeds extends Handler_Protected { $res = $pdo->query($query); } - return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id); + return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != ""); } diff --git a/js/Headlines.js b/js/Headlines.js index 6e1901fdc..77070f815 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -561,6 +561,9 @@ define(["dojo/_base/declare"], function (declare) { $("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal"); + $("headlines-frame").setAttribute("is-vfeed", + reply['headlines']['is_vfeed'] ? 1 : 0); + Article.setActive(0); try { diff --git a/update.php b/update.php index cddad0e8f..a72e3445f 100755 --- a/update.php +++ b/update.php @@ -123,9 +123,9 @@ } if (isset($options["log"])) { + Debug::set_quiet(isset($options['quiet'])); Debug::set_logfile($options["log"]); Debug::log("Logging to " . $options["log"]); - Debug::set_quiet(isset($options['quiet'])); } else { if (isset($options['quiet'])) { Debug::set_loglevel(Debug::$LOG_DISABLED); |