aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-05-26 10:09:27 +0200
committerGravatar GitHub <noreply@github.com> 2017-05-26 10:09:27 +0200
commit1f0c6ee9f7a8fb4daebe629ed636351e0c3c7475 (patch)
treed085598df5e057a09be17499eeb1bb7ead9cbd40
parentb3addb49dca4fc06d13d9c57617273fbcd4460da (diff)
parenta4aef7bf83d691cd2a5e8a6a73fe463a18a6bfc2 (diff)
Merge pull request #1543 from Alkarex/mark-as-read-new-feeds
Fix *mark as read* articles when adding a new feed
-rw-r--r--CHANGELOG.md1
-rwxr-xr-xapp/Controllers/feedController.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 443f72272..4592790fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
* Fix UI lowest subscription popup hidden [#1479](https://github.com/FreshRSS/FreshRSS/issues/1479)
* Fix update system via ZIP archive [#1498](https://github.com/FreshRSS/FreshRSS/pull/1498)
* Work around for IE / Edge bug in username pattern in version 1.6.3 [#1511](https://github.com/FreshRSS/FreshRSS/issues/1511)
+ * Fix *mark as read* articles when adding a new feed [#1535](https://github.com/FreshRSS/FreshRSS/issues/1535)
* UI
* Download icon 💾 for other MIME types (e.g. `application/*`) [#1522](https://github.com/FreshRSS/FreshRSS/pull/1522)
* I18n
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 8e0e5dd6d..c9b6deaa7 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -348,6 +348,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
} else {
if ($isNewFeed) {
$id = min(time(), $entry_date) . uSecString();
+ $entry->_isRead($is_read);
} elseif ($entry_date < $date_min) {
$id = min(time(), $entry_date) . uSecString();
$entry->_isRead(true); //Old article that was not in database. Probably an error, so mark as read