aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-19 16:22:07 -0700
committerfriendica <info@friendica.com>2013-10-19 16:22:07 -0700
commitd39f1c570caa531897324a5a5ae1e9b0d165a27f (patch)
tree609e002b65cb8306dc93ba419c0981b31580d861
parentd54b6099d248a2fa05bb21d7f1b822bbaa0421fa (diff)
downloadvolse-hubzilla-d39f1c570caa531897324a5a5ae1e9b0d165a27f.tar.gz
volse-hubzilla-d39f1c570caa531897324a5a5ae1e9b0d165a27f.tar.bz2
volse-hubzilla-d39f1c570caa531897324a5a5ae1e9b0d165a27f.zip
part one - honour system.tagifonlyrecip pconfig, default is false - not ready to deal with the second part yet (changing the tag char for tag_deliver channels) without a bit more discussion/concensus.
-rw-r--r--mod/item.php5
1 files changed, 3 insertions, 2 deletions
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)