placeholder arg in dfrn conversations

diff --git a/include/items.php b/include/items.php
index 58fad99272a62dcb496b1cd9e7f3d0cdde01cad8..4a740e55b2b7359cf52e4692ab3adc7599dd05e5 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if(! $rino_enable)
                $rino = 0;
 
-       $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+       $url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
        logger('dfrn_deliver: ' . $url);
 

diff --git a/include/poller.php b/include/poller.php
index 8619697d9661d3697f1f20e5ed00d0b7e013208b..98c55a2a9249a345b396d7d42d18301cfbe35fdb 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
                                if(intval($contact['duplex']) && $contact['issued-id'])
                                        $idtosend = '1:' . $orig_id;            
 
-                               $url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+                               $url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
                                        . '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
                                        . '&type=data&last_update=' . $last_update ;
        

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index eb499fbd1ae82c85a7540e65205ec1f6e9917e91..686a42d082579ff9f82b00c39b064529f339cd91 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
                
                if(count($r)) {
 
-                       $s = fetch_url($r[0]['poll'] . '&dfrn_id=' . $my_id . '&type=profile-check');
+                       $s = fetch_url($r[0]['poll'] . '?f=&dfrn_id=' . $my_id . '&type=profile-check');
 
                        logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
@@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
                        // URL reply
 
                        $s = fetch_url($r[0]['poll'] 
-                               . '&dfrn_id=' . $encrypted_id 
+                               . '?f=&dfrn_id=' . $encrypted_id 
                                . '&type=profile-check'
                                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
                                . '&challenge=' . $challenge

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f1af1ce4cb285e06c44d648f759f20b13e4f6368..cc63550789e24e7f6f447cd268e5f12cd1e9a11b 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
                                        $dfrn_request = $contact_record['request'];
 
                                if(strlen($dfrn_request) && strlen($confirm_key))
-                                       $s = fetch_url($dfrn_request . '&confirm_key=' . $confirm_key);
+                                       $s = fetch_url($dfrn_request . '?f=&confirm_key=' . $confirm_key);
                                
                                // (ignore reply, nothing we can do it failed)