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

Account for falsy values for $forum_contact in mod/item 

- Rare condition can make it false
- Simplify notification sending condition
This commit is contained in:
Hypolite Petovan 2020-07-04 15:33:35 -04:00
parent ecb9eecdc8
commit 6ead246ce2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/item.php
View File

@ -423,7 +423,7 @@ function item_post(App $a) {
$original_contact_id = $contact_id; $original_contact_id = $contact_id;
if (!$toplevel_item_id && count($forum_contact) && ($private_forum || $only_to_forum)) { if (!$toplevel_item_id && !empty($forum_contact) && ($private_forum || $only_to_forum)) {
// we tagged a forum in a top level post. Now we change the post // we tagged a forum in a top level post. Now we change the post
$private = $private_forum; $private = $private_forum;
@ -745,8 +745,8 @@ function item_post(App $a) {
FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category'); FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
// These notifications are sent if someone else is commenting other your wall // These notifications are sent if someone else is commenting other your wall
if ($toplevel_item_id) { if ($contact_record != $author) {
if ($contact_record != $author) { if ($toplevel_item_id) {
notification([ notification([
'type' => Type::COMMENT, 'type' => Type::COMMENT,
'notify_flags' => $user['notify-flags'], 'notify_flags' => $user['notify-flags'],
@ -764,9 +764,7 @@ function item_post(App $a) {
'parent' => $toplevel_item_id, 'parent' => $toplevel_item_id,
'parent_uri' => $toplevel_item['uri'] 'parent_uri' => $toplevel_item['uri']
]); ]);
} } elseif (empty($forum_contact)) {
} else {
if (($contact_record != $author) && !count($forum_contact)) {
notification([ notification([
'type' => Type::WALL, 'type' => Type::WALL,
'notify_flags' => $user['notify-flags'], 'notify_flags' => $user['notify-flags'],