From: Michael <heluecht@pirati.ca>
Date: Mon, 4 May 2020 14:38:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into notification-uri-id
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=49db63da2b11ce899639f9c1b53e1f47a456c822;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into notification-uri-id
---

49db63da2b11ce899639f9c1b53e1f47a456c822
diff --cc include/enotify.php
index bd96ca5d2e,78a390e657..81b491ade5
--- a/include/enotify.php
+++ b/include/enotify.php
@@@ -589,7 -574,7 +589,7 @@@ function check_user_notification($itemi
   * @throws \Friendica\Network\HTTPException\InternalServerErrorException
   */
  function check_item_notification($itemid, $uid, $notification_type) {
- 	$fields = ['id', 'uri-id', 'mention', 'tag', 'parent', 'parent-uri-id', 'title', 'body',
 -	$fields = ['id', 'mention', 'parent', 'title', 'body',
++	$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];