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

minor nits

Browse Source
This commit is contained in:
friendica 2014-09-01 22:59:11 -07:00
parent 688722de5b
commit 9dac46ca25
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/diaspora.php
View File

@ -2584,18 +2584,22 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
* *
*/ */
$handle = diaspora_handle_from_contact($item['author_xchan']); if($item['author_xchan'] === $owner['channel_hash'])
$handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
else
$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;
} }
if($relay_retract) if($relay_retract)
$sender_signed_text = $item['guid'] . ';' . $target_type; $sender_signed_text = $item['mid'] . ';' . $target_type;
elseif($like) elseif($like)
$sender_signed_text = $item['guid'] . ';' . $target_type . ';' . $parent['guid'] . ';' . $positive . ';' . $handle; $sender_signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $handle;
else else
$sender_signed_text = $item['guid'] . ';' . $parent['guid'] . ';' . $text . ';' . $handle; $sender_signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $handle;
// Sign the relayable with the top-level owner's signature // Sign the relayable with the top-level owner's signature
// //