aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-31 18:14:12 -0700
committerMario Vavti <mario@mariovavti.com>2017-06-07 09:30:45 +0200
commit324d427ac722d25067a3b296fd0705385c1a4e6a (patch)
tree92903e5743cc10145fb689674a5a904296293296 /include/conversation.php
parent84c04cfe1c2ccb95067bc118a16cd70ce2c6ee05 (diff)
downloadvolse-hubzilla-324d427ac722d25067a3b296fd0705385c1a4e6a.tar.gz
volse-hubzilla-324d427ac722d25067a3b296fd0705385c1a4e6a.tar.bz2
volse-hubzilla-324d427ac722d25067a3b296fd0705385c1a4e6a.zip
a slight tweak to author_is_pmable hook to make it useful
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php10
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) {