|
@@ -353,11 +353,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
|
|
|
} else { //This entry already exists but has been updated
|
|
} else { //This entry already exists but has been updated
|
|
|
//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->url(false) .
|
|
//Minz_Log::debug('Entry with GUID `' . $entry->guid() . '` updated in feed ' . $feed->url(false) .
|
|
|
//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
|
|
//', old hash ' . $existingHash . ', new hash ' . $entry->hash());
|
|
|
- $mark_updated_article_unread = $feed->attributes('mark_updated_article_unread') !== null ? (
|
|
|
|
|
- $feed->attributes('mark_updated_article_unread')
|
|
|
|
|
- ) : FreshRSS_Context::$user_conf->mark_updated_article_unread;
|
|
|
|
|
|
|
+ $mark_updated_article_unread = $feed->attributes('mark_updated_article_unread') !== null ?
|
|
|
|
|
+ $feed->attributes('mark_updated_article_unread') : FreshRSS_Context::$user_conf->mark_updated_article_unread;
|
|
|
$needFeedCacheRefresh = $mark_updated_article_unread;
|
|
$needFeedCacheRefresh = $mark_updated_article_unread;
|
|
|
- $entry->_isRead(FreshRSS_Context::$user_conf->mark_updated_article_unread ? false : null); //Change is_read according to policy.
|
|
|
|
|
|
|
+ $entry->_isRead($mark_updated_article_unread ? false : null); //Change is_read according to policy.
|
|
|
|
|
|
|
|
$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
|
|
$entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry);
|
|
|
if ($entry === null) {
|
|
if ($entry === null) {
|