diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-04 11:59:46 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-04 11:59:46 +0200 |
| commit | a0cefe7fdbf3d3336402ecc59aabe4df508a19a6 (patch) | |
| tree | 960f419669b809a7ffa68ed4a45bf63a18bf7ba2 /Zotlabs | |
| parent | 998dd582068a2ffd31f3388aaefe4d639d7eb9c0 (diff) | |
| parent | 56113b0bde6ea78f1ac0c61eb6ca9324900035c2 (diff) | |
| download | volse-hubzilla-a0cefe7fdbf3d3336402ecc59aabe4df508a19a6.tar.gz volse-hubzilla-a0cefe7fdbf3d3336402ecc59aabe4df508a19a6.tar.bz2 volse-hubzilla-a0cefe7fdbf3d3336402ecc59aabe4df508a19a6.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Item.php | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index fd99c4a64..640b4fa5c 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -528,16 +528,6 @@ class Item extends \Zotlabs\Web\Controller { // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) // we may need virtual or template classes to implement the possible alternatives - // 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) && (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, abconfig.v from abook left join abconfig on abook_xchan = abconfig.xchan and abook_channel = abconfig.chan and cat= 'their_perms' and abconfig.k = 'tag_deliver' and abconfig.v = 1 and abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), - intval($profile_uid) - ); - if($x) - $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; - } $body = cleanup_bbcode($body); |