harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to proceed with a diaspora relayable even if we don't have the original author's signature.

Browse Source
This commit is contained in:
friendica 2014-09-02 21:43:46 -07:00
parent 7001f41d3d
commit 8337fd7bb4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/diaspora.php
View File

@ -2558,7 +2558,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
intval($item['id']) intval($item['id'])
); );
if(count($r)) { if($r) {
$orig_sign = $r[0]; $orig_sign = $r[0];
$signed_text = $orig_sign['signed_text']; $signed_text = $orig_sign['signed_text'];
$authorsig = $orig_sign['signature']; $authorsig = $orig_sign['signature'];
@ -2569,7 +2569,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
// whether from Diaspora or Friendica) must be placed in the `sign` table before this // whether from Diaspora or Friendica) must be placed in the `sign` table before this
// function is called // function is called
logger('diaspora_send_relay: original author signature not found, cannot send relayable'); logger('diaspora_send_relay: original author signature not found, cannot send relayable');
return; // ignore - see below
// return;
} }
/* Since the author signature is only checked by the parent, not by the relay recipients, /* Since the author signature is only checked by the parent, not by the relay recipients,
@ -2584,11 +2585,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
* *
*/ */
if(! $handle) {
if($item['author_xchan'] === $owner['channel_hash']) if($item['author_xchan'] === $owner['channel_hash'])
$handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
else else
$handle = diaspora_handle_from_contact($item['author_xchan']); $handle = diaspora_handle_from_contact($item['author_xchan']);
}
if(! $handle) { if(! $handle) {
logger('diaspora_send_relay: no handle'); logger('diaspora_send_relay: no handle');
return; return;