diff --git a/boot.php b/boot.php index 5b0c9b3638..cc64ef1740 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1547' ); +define ( 'FRIENDICA_VERSION', '3.1.1549' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/include/onepoll.php b/include/onepoll.php index a50d234e22..8fabede11c 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -111,6 +111,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; @@ -120,6 +121,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 diff --git a/util/messages.po b/util/messages.po index ea730a5a32..0310bbfa28 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1547\n" +"Project-Id-Version: 3.1.1549\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-04 10:00-0800\n" +"POT-Creation-Date: 2012-12-06 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"