clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6926 from MrPetovan/bug/6921-regression-6783 

Restore marking thread notifications as seen behavior
This commit is contained in:
Michael Vogel 2019-03-24 06:47:58 +01:00 committed by GitHub
parent 60d931c85d 42a3512c22
commit c93f527beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -5,12 +5,13 @@ Version 2019.06 (UNRELEASED) (2019-06-?)
Fixed the notification order [JeroenED] Fixed the notification order [JeroenED]
Fixed the timezone of Friendica logs [nupplaphil] Fixed the timezone of Friendica logs [nupplaphil]
Fixed tag completion painfully slow [AlfredSK] Fixed tag completion painfully slow [AlfredSK]
Fixed a regression in notifications [MrPetovan]
General Code cleaning and restructuring [nupplaphil] General Code cleaning and restructuring [nupplaphil]
Added frio color scheme sharing [JeroenED] Added frio color scheme sharing [JeroenED]
Added syslog and stream Logger [nupplaphil] Added syslog and stream Logger [nupplaphil]
Closed Issues: Closed Issues:
6303, 6478, 6319 6303, 6478, 6319, 6921
Version 2019.03 (2019-03-22) Version 2019.03 (2019-03-22)
Friendica Core: Friendica Core:

8
src/Core/NotificationsManager.php
View File

@ -108,7 +108,13 @@ class NotificationsManager extends BaseObject
*/ */
public function setSeen($note, $seen = true) public function setSeen($note, $seen = true)
{ {
return DBA::update('notify', ['seen' => $seen], ['link' => $note['link'], 'parent' => $note['parent'], 'otype' => $note['otype'], 'uid' => local_user()]); return DBA::update('notify', ['seen' => $seen], [
'(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?',
$note['link'],
$note['parent'],
$note['otype'],
local_user()
]);
} }
/** /**