MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

placeholder arg in dfrn conversations

Browse source
This commit is contained in:
Friendika 2011-03-30 04:20:40 -07:00
parent f198c5cff8
commit 04cd865cc9
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if(! $rino_enable) if(! $rino_enable)
$rino = 0; $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); logger('dfrn_deliver: ' . $url);

2
include/poller.php
View file

@ -167,7 +167,7 @@ function poller_run($argv, $argc){
if(intval($contact['duplex']) && $contact['issued-id']) if(intval($contact['duplex']) && $contact['issued-id'])
$idtosend = '1:' . $orig_id; $idtosend = '1:' . $orig_id;
$url = $contact['poll'] . '?dfrn_id=' . $idtosend $url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=data&last_update=' . $last_update ; . '&type=data&last_update=' . $last_update ;

4
mod/dfrn_poll.php
View file

@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
if(count($r)) { 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); logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
// URL reply // URL reply
$s = fetch_url($r[0]['poll'] $s = fetch_url($r[0]['poll']
. '&dfrn_id=' . $encrypted_id . '?f=&dfrn_id=' . $encrypted_id
. '&type=profile-check' . '&type=profile-check'
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&challenge=' . $challenge . '&challenge=' . $challenge

2
mod/dfrn_request.php
View file

@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
$dfrn_request = $contact_record['request']; $dfrn_request = $contact_record['request'];
if(strlen($dfrn_request) && strlen($confirm_key)) 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) // (ignore reply, nothing we can do it failed)