placeholder arg in dfrn conversations
This commit is contained in:
		
					parent
					
						
							
								f198c5cff8
							
						
					
				
			
			
				commit
				
					
						04cd865cc9
					
				
			
		
					 4 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -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);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 ;
 | 
			
		||||
	
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue