diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
| commit | b23f3fc03b6bc751aab67fe2258a21f7c65bab8e (patch) | |
| tree | 84c997aa781afa566536ca5f66eb8f90ef468476 /include/notifier.php | |
| parent | d30f718e0836a031e43d5403480aa049561e736e (diff) | |
| parent | 0b0bd3c20765d267ec6d7cc261c7713917a22582 (diff) | |
| download | volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.gz volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.bz2 volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.zip | |
Merge pull request #3 from friendica/master
Align to main project HEAD
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index 0c7ac5264..1407be4b3 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -325,12 +325,13 @@ function notifier_run($argv, $argc){ // tag_deliver'd post which needs to be sent back to the original author if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post)) { - $uplink = true; + logger('notifier: uplink'); + $uplink = true; } if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) { logger('notifier: followup relay', LOGGER_DEBUG); - $recipients = array(($uplink) ? $parent_item['author_xchan'] : $parent_item['owner_xchan']); + $recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']); $private = true; if(! $encoded_item['flags']) $encoded_item['flags'] = array(); @@ -443,7 +444,7 @@ function notifier_run($argv, $argc){ $n = zot_build_packet($channel,$packet_type); q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s' )", dbesc($hash), - intval($channel['channel_account']), + intval($channel['channel_account_id']), intval($channel['channel_id']), dbesc($hub['hubloc_callback']), intval(1), |