aboutsummaryrefslogtreecommitdiff
path: root/app/Models
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-06-05 14:26:12 +0200
committerGravatar GitHub <noreply@github.com> 2024-06-05 14:26:12 +0200
commit7d110c23a9366feef5e152cc6563c8ed058d6376 (patch)
treefc499956c77a947491e2466ae8c3963ff1f356ba /app/Models
parent84e961dc48c2a242df9e1b92f4916a6a24c458d7 (diff)
Fix attributeBoolean (#6543)
Regression from https://github.com/FreshRSS/FreshRSS/pull/5946 fix https://github.com/FreshRSS/FreshRSS/issues/6521
Diffstat (limited to 'app/Models')
-rw-r--r--app/Models/AttributesTrait.php5
-rw-r--r--app/Models/Entry.php3
2 files changed, 6 insertions, 2 deletions
diff --git a/app/Models/AttributesTrait.php b/app/Models/AttributesTrait.php
index e94a973d9..8795d81d9 100644
--- a/app/Models/AttributesTrait.php
+++ b/app/Models/AttributesTrait.php
@@ -15,6 +15,11 @@ trait FreshRSS_AttributesTrait {
return $this->attributes;
}
+ /** @param non-empty-string $key */
+ public function hasAttribute(string $key): bool {
+ return isset($this->attributes[$key]);
+ }
+
/**
* @param non-empty-string $key
* @return array<int|string,mixed>|null
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index ad480f3e6..3caa1ddb9 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -672,8 +672,7 @@ HTML;
return;
}
if (!$this->isRead()) {
- if ($feed->attributeBoolean('read_upon_reception') ||
- ($feed->attributeBoolean('read_upon_reception') === null && FreshRSS_Context::userConf()->mark_when['reception'])) {
+ if ($feed->attributeBoolean('read_upon_reception') ?? FreshRSS_Context::userConf()->mark_when['reception']) {
$this->_isRead(true);
Minz_ExtensionManager::callHook('entry_auto_read', $this, 'upon_reception');
}