From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 4 Jul 2020 19:33:35 +0000 (-0400)
Subject: Account for falsy values for $forum_contact in mod/item
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ead246ce256ddee88d8108f6e169208f22cc52b;p=friendica.git

Account for falsy values for $forum_contact in mod/item

- Rare condition can make it false
- Simplify notification sending condition
---

diff --git a/mod/item.php b/mod/item.php
index e56e4c68d9..08a565e069 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -423,7 +423,7 @@ function item_post(App $a) {
 
 	$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
 		$private = $private_forum;
 
@@ -745,8 +745,8 @@ function item_post(App $a) {
 	FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
 
 	// 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([
 				'type'         => Type::COMMENT,
 				'notify_flags' => $user['notify-flags'],
@@ -764,9 +764,7 @@ function item_post(App $a) {
 				'parent'       => $toplevel_item_id,
 				'parent_uri'   => $toplevel_item['uri']
 			]);
-		}
-	} else {
-		if (($contact_record != $author) && !count($forum_contact)) {
+		} elseif (empty($forum_contact)) {
 			notification([
 				'type'         => Type::WALL,
 				'notify_flags' => $user['notify-flags'],