X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=7b0ff2ce6b09e0fbd936012674c6f1fe61585335;hb=2fc89deaeae0341aa12b6b811927e793011055d1;hp=cbe0e970d1457d359217f044c10c3ff7687ed0de;hpb=08d6fe5ae74cc223e4385344f8e0edfde4208a23;p=friendica.git

diff --git a/include/items.php b/include/items.php
index cbe0e970d1..7b0ff2ce6b 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;
@@ -1165,7 +1167,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 					);
 					$datarray['last-child'] = 1;
 				}
-				if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) {
+				if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
 					// one way feed - no remote comment ability
 					$datarray['last-child'] = 0;
 				}
@@ -1221,7 +1223,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 					$datarray['last-child'] = 1;
 				}
 
-				if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) {
+				if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
 					// one way feed - no remote comment ability
 					$datarray['last-child'] = 0;
 				}