diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-01-25 19:03:41 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-01-25 19:03:41 +0100 |
| commit | 6558ee1e2210fb41b1f4d95f806ee441a565087d (patch) | |
| tree | ae1f34aa7a25432652b2bc1f1264d09dc94c51cf /include/items.php | |
| parent | 1f95ba5c344a1b17c735bf2760a169beeff864c2 (diff) | |
| parent | bb5ad77e2a67e0443444a433583c7d8de1a037a9 (diff) | |
| download | volse-hubzilla-6558ee1e2210fb41b1f4d95f806ee441a565087d.tar.gz volse-hubzilla-6558ee1e2210fb41b1f4d95f806ee441a565087d.tar.bz2 volse-hubzilla-6558ee1e2210fb41b1f4d95f806ee441a565087d.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index cbe0e970d..b6a588800 100644 --- a/include/items.php +++ b/include/items.php @@ -756,7 +756,7 @@ function get_item_contact($item,$contacts) { } -function dfrn_deliver($owner,$contact,$atom) { +function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $a = get_app(); @@ -827,6 +827,8 @@ function dfrn_deliver($owner,$contact,$atom) { $postvars['dfrn_id'] = $idtosend; $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; + if($dissolve) + $postvars['dissolve'] = '1'; if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) { $postvars['data'] = $atom; @@ -838,7 +840,7 @@ function dfrn_deliver($owner,$contact,$atom) { $postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom); } - if($rino && $rino_allowed) { + if($rino && $rino_allowed && (! $dissolve)) { $key = substr(random_string(),0,16); $data = bin2hex(aes_encrypt($postvars['data'],$key)); $postvars['data'] = $data; |