aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-31 18:14:12 -0700
committerzotlabs <mike@macgirvin.com>2017-05-31 18:14:12 -0700
commit35debe46bc0a10f3bad21303e127cb29526c94a2 (patch)
tree2ee19f349bca4015cbb860f8a48338f23a97db25 /include
parent98c18f416a4c809059f4cdf27a833bb9b1134280 (diff)
downloadvolse-hubzilla-35debe46bc0a10f3bad21303e127cb29526c94a2.tar.gz
volse-hubzilla-35debe46bc0a10f3bad21303e127cb29526c94a2.tar.bz2
volse-hubzilla-35debe46bc0a10f3bad21303e127cb29526c94a2.zip
a slight tweak to author_is_pmable hook to make it useful
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index b6832e22c..3f9ee5cfa 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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) {