diff options
| -rw-r--r-- | doc/Hooks.md | 1 | ||||
| -rw-r--r-- | mod/item.php | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/Hooks.md b/doc/Hooks.md index 005898ef0..350068314 100644 --- a/doc/Hooks.md +++ b/doc/Hooks.md @@ -49,6 +49,7 @@ Hooks - Complete List * 'home_init' * 'html2bbcode' * 'import_directory_profile' +* 'init_1' * 'item_photo_menu' * 'item_translate' * 'jot_networks' diff --git a/mod/item.php b/mod/item.php index 08076bdf6..218e9c174 100644 --- a/mod/item.php +++ b/mod/item.php @@ -385,9 +385,10 @@ function item_post(&$a) { $body = fix_mce_lf($body); } - // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it. + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set. - if((! $parent) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { + + if((! $parent) && (get_pconfig($profile_uid,'system','tagifonlyrecip')) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { $x = q("select abook_id, abook_their_perms from abook where abook_xchan = '%s' and abook_channel = %d limit 1", dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), intval($profile_uid) |