X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fenotify.php;h=732c1d7b43c18e401f5cb31c494b3689780ec2a6;hb=aa0b485f3dca72c5448076e913fa54d948cd7731;hp=ae2e2e7fefba2526e381350dfd9b00861f5f8cf2;hpb=df7eb7fcc5260c727173a221b8a64cf0278d7890;p=friendica.git

diff --git a/include/enotify.php b/include/enotify.php
index ae2e2e7fef..732c1d7b43 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -465,7 +465,7 @@ function notification($params)
 	if ($show_in_notification_page) {
 		$notification = DI::notify()->insert([
 			'name'          => $params['source_name'] ?? '',
-			'name_cache'    => substr(strip_tags(BBCode::convert($params['source_name'] ?? '')), 0, 255),
+			'name_cache'    => substr(strip_tags(BBCode::convert($params['source_name'])), 0, 255),
 			'url'           => $params['source_link'] ?? '',
 			'photo'         => $params['source_photo'] ?? '',
 			'link'          => $itemlink ?? '',
@@ -479,6 +479,11 @@ function notification($params)
 			'otype'         => $params['otype'] ?? '',
 		]);
 
+		// Notification insertion can be intercepted by an addon registering the 'enotify_store' hook
+		if (!$notification) {
+			return false;
+		}
+
 		$notification->msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $notification->link]);
 
 		DI::notify()->update($notification);
@@ -592,7 +597,7 @@ function check_item_notification($itemid, $uid, $notification_type) {
 	$fields = ['id', 'uri-id', 'mention', 'parent', 'parent-uri-id', 'title', 'body',
 		'author-link', 'author-name', 'author-avatar', 'author-id',
 		'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
-	$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'deleted' => false];
+	$condition = ['id' => $itemid, 'deleted' => false];
 	$item = Item::selectFirstForUser($uid, $fields, $condition);
 	if (!DBA::isResult($item)) {
 		return false;