harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.8RC'

Browse Source
This commit is contained in:
Mario
2017-10-25 13:29:19 +02:00
parent 61c86212b9 69b22e3f79
commit 344aa13c64
310 changed files with 20161 additions and 7135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/import.php
View File

@@ -603,6 +603,11 @@ function import_items($channel, $items, $sync = false, $relocate = null) {
if(! $item)
continue;
// deprecated
if(array_key_exists('diaspora_meta',$item))
unset($item['diaspora_meta']);
if($relocate && $item['mid'] === $item['parent_mid']) {
item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
}
@@ -640,6 +645,12 @@ function import_items($channel, $items, $sync = false, $relocate = null) {
fix_attached_file_permissions($channel,$item['author_xchan'],$item['body'],$item['allow_cid'],$item['allow_gid'],$item['deny_cid'],$item['deny_gid']);
if($sync && $item['item_wall']) {
// deliver singletons if we have any
if($item_result && $item_result['success']) {
Zotlabs\Daemon\Master::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]);
}
}
}
}
}
@@ -1013,6 +1024,9 @@ function import_mail($channel, $mails, $sync = false) {
$m['aid'] = $channel['channel_account_id'];
$m['uid'] = $channel['channel_id'];
$mail_id = mail_store($m);
if($sync && $mail_id) {
Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));
}
}
}
}