friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-09 22:40:15 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Provide a parent in the notification, so that threading of the notification mails is working.

Browse source
This commit is contained in:
Michael Vogel 2014-08-21 01:00:12 +02:00
parent 53dcecd596
commit 845805bf34
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/items.php
View file

@ -1567,7 +1567,8 @@ function tag_deliver($uid,$item_id) {
'source_link' => $item['author-link'], 'source_link' => $item['author-link'],
'source_photo' => $photo, 'source_photo' => $photo,
'verb' => ACTIVITY_TAG, 'verb' => ACTIVITY_TAG,
'otype' => 'item' 'otype' => 'item',
'parent' => $item['parent']
)); ));
@ -1970,7 +1971,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
} }
if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) { if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
logger('consume_feed: Updating photo for ' . $contact['name']); logger('consume_feed: Updating photo for '.$contact['name'].' from '.$photo_url.' uid: '.$contact['uid']);
require_once("include/Photo.php"); require_once("include/Photo.php");
$photo_failure = false; $photo_failure = false;
$have_photo = false; $have_photo = false;