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

fix for forked thread on diaspora

Browse Source
This commit is contained in:
redmatrix 2015-05-27 16:01:51 -07:00
parent 3fdf1ac458
commit 3ecc9efd8d
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/diaspora.php
View File

@ -2400,6 +2400,11 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
$a = get_app(); $a = get_app();
$myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
if(intval($item['id']) != intval($item['parent'])) {
logger('attempted to send a comment as a top-level post');
return;
}
$images = array(); $images = array();
$title = $item['title']; $title = $item['title'];

11
include/notifier.php
View File

@ -430,17 +430,6 @@ function notifier_run($argv, $argc){
$uplink = true; $uplink = true;
} }
// FIXME - make sure this is complete (the other uplink) and check before enabling
// if((! $top_level_post) && (! $relay_to_owner) && (! $uplink) && ($cmd !== 'relay')) {
// We've been asked to deliver a comment, but it isn't being sent upstream
// and the owner isn't delivering it downstream. This is totally unexpected
// and shouldn't happen. We will also not allow it to happen.
// logger('Comment being processed with unspecific routing.');
// return;
// }
if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) { if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
logger('notifier: followup relay', LOGGER_DEBUG); logger('notifier: followup relay', LOGGER_DEBUG);
$recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']); $recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);