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

diff --cc include/enotify.php
index bd96ca5d2e80fdc8e084b8b22a45e0afd2d3d0b5,78a390e657511a041136d90dfe60671918ee779d..81b491ade504562ff5416d2f95ccc0940dede65b
--- 1/include/enotify.php
--- 2/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];