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

a slight tweak to author_is_pmable hook to make it useful

Browse Source
This commit is contained in:
zotlabs
2017-05-31 18:14:12 -07:00
parent 98c18f416a
commit 35debe46bc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/conversation.php
View File

@@ -909,9 +909,9 @@ function thread_action_menu($item,$mode = '') {
}
function author_is_pmable($xchan) {
function author_is_pmable($xchan, $abook) {
$x = [ 'xchan' => $xchan, 'result' => 'unset' ];
$x = [ 'xchan' => $xchan, 'abook' => $abook, 'result' => 'unset' ];
call_hooks('author_is_pmable',$x);
if($x['result'] !== 'unset')
return $x['result'];
@@ -941,7 +941,7 @@ function thread_author_menu($item, $mode = '') {
}
$profile_link = chanlink_hash($item['author_xchan']);
$contact = false;
if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
$contact = App::$contacts[$item['author_xchan']];
@@ -950,9 +950,9 @@ function thread_author_menu($item, $mode = '') {
$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
if($item['uid'] > 0 && author_is_pmable($item['author']))
if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
}
if($contact) {