diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-15 17:10:11 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-15 17:10:11 +0100 |
| commit | 68ecc673b109be50dc04cf72af8ce2296c70b86b (patch) | |
| tree | 0ecaa24425d2f69528ad99763d929cccd677d148 /include/diaspora.php | |
| parent | e3b967f475e8933567ba7d80dacb6d496224fe55 (diff) | |
| parent | eaf3bd3326a657662321df791280b41293f54ef2 (diff) | |
| download | volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.gz volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.bz2 volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 33404da74..ea3c78bfe 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -142,6 +142,7 @@ function diaspora_process_outbound($arr) { 'cmd' => $cmd, 'expire' => $expire, 'mail' => $mail, + 'location' => $location, 'fsuggest' => $fsuggest, 'normal_mode' => $normal_mode, 'packet_type' => $packet_type, @@ -150,6 +151,10 @@ function diaspora_process_outbound($arr) { */ + if($arr['location']) + return; + + $target_item = $arr['target_item']; if($target_item && array_key_exists('item_flags',$target_item) && ($target_item['item_flags'] & ITEM_OBSCURED)) { @@ -161,6 +166,7 @@ function diaspora_process_outbound($arr) { } + if($arr['env_recips']) { $hashes = array(); |