Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 05:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2012-12-17 10:32:53 +01:00
commit a6b1275f16
26 changed files with 8019 additions and 4840 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/onepoll.php
View file

@ -118,6 +118,7 @@ function onepoll_run(&$argv, &$argc){
if($contact['network'] === NETWORK_DFRN) {
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
if(intval($contact['duplex']) && $contact['dfrn-id'])
$idtosend = '0:' . $orig_id;
@ -127,6 +128,12 @@ function onepoll_run(&$argv, &$argc){
// they have permission to write to us. We already filtered this in the contact query.
$perm = 'rw';
// But this may be our first communication, so set the writable flag if it isn't set already.
if(! intval($contact['writable']))
q("update contact set writable = 1 where id = %d limit 1", intval($contact['id']));
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
. '&type=data&last_update=' . $last_update