diff options
| author | zotlabs <mike@macgirvin.com> | 2017-06-07 17:07:44 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-06-07 17:07:44 -0700 |
| commit | 416a82bf121e568569ed28590092d34dd25da6c0 (patch) | |
| tree | face76b8cda01ebfe8a1d3090235f1b524b75761 /include/conversation.php | |
| parent | 40b9130c63fbcc5bfd4ba5feb5463000dfe99d43 (diff) | |
| parent | 55836e8ca65ca9a2ae25591de3232470d7a50049 (diff) | |
| download | volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.tar.gz volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.tar.bz2 volse-hubzilla-416a82bf121e568569ed28590092d34dd25da6c0.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 0f940b1a3..c325a516f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -917,9 +917,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']; @@ -949,7 +949,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']]; @@ -958,9 +958,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) { |