aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-04 18:53:06 -0700
committerzotlabs <mike@macgirvin.com>2018-04-04 18:53:06 -0700
commite8646799427a51a13e97f83a7858274fbf85ba20 (patch)
tree7b8fd5a876a0ba2cfa9e451c4f59df5dd94b893c /include
parentcadef5924fd42e45e4a1a19c7c8cb559d1ea8fd7 (diff)
downloadvolse-hubzilla-e8646799427a51a13e97f83a7858274fbf85ba20.tar.gz
volse-hubzilla-e8646799427a51a13e97f83a7858274fbf85ba20.tar.bz2
volse-hubzilla-e8646799427a51a13e97f83a7858274fbf85ba20.zip
private forum mentions
Diffstat (limited to 'include')
-rw-r--r--include/text.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 658f53305..255d02c7c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2577,6 +2577,9 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
// The @! tag will alter permissions
$exclusive = (((! $grouptag) && (strpos($tag,'!') === 1) && (! $diaspora)) ? true : false);
+ if(($grouptag) && (strpos($tag,'!!') === 0)) {
+ $exclusive = true;
+ }
//is it already replaced?
if(strpos($tag,'[zrl='))
@@ -2749,8 +2752,8 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
$profile = str_replace(',','%2c',$profile);
$url = $profile;
if($grouptag) {
- $newtag = '!' . '[zrl=' . $profile . ']' . $newname . '[/zrl]';
- $body = str_replace('!' . $name, $newtag, $body);
+ $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]';
+ $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body);
}
else {
$newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . (($forum && ! $trailing_plus_name) ? '+' : '') . '[/zrl]';
@@ -2800,6 +2803,7 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) {
continue;
$success = handle_tag($a, $body, $access_tag, $str_tags, ($uid) ? $uid : App::$profile_uid , $tag, $diaspora);
+
$results[] = array('success' => $success, 'access_tag' => $access_tag);
if($success['replaced']) $tagged[] = $tag;
}