diff options
| author | Mario <mario@mariovavti.com> | 2020-12-18 13:26:51 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-12-18 13:26:51 +0000 |
| commit | 8640e6d1df1004191a1cac9a2d894c73aa06f84a (patch) | |
| tree | eb67e4be49b01c3f62f470f67c29d150a748a009 /include/text.php | |
| parent | 801583fd072e8ebe06fa6aeb97d9dd78785a6f39 (diff) | |
| download | volse-hubzilla-8640e6d1df1004191a1cac9a2d894c73aa06f84a.tar.gz volse-hubzilla-8640e6d1df1004191a1cac9a2d894c73aa06f84a.tar.bz2 volse-hubzilla-8640e6d1df1004191a1cac9a2d894c73aa06f84a.zip | |
deprecate ! and !! forum tags
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/text.php b/include/text.php index 27b8d49a7..76df9e17b 100644 --- a/include/text.php +++ b/include/text.php @@ -2795,7 +2795,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN); $termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype); - $termtype = ((strpos($tag,'!') === 0) ? TERM_FORUM : $termtype); +// $termtype = ((strpos($tag,'!') === 0) ? TERM_FORUM : $termtype); $termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype); // Is it a hashtag of some kind? @@ -2864,7 +2864,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) if ( in_array($termtype, [ TERM_MENTION, TERM_FORUM ] )) { - // The @! tag and !! tag will alter permissions + // The @! tag will alter permissions // $in_network is set to false to avoid false positives on posts originating // on a network which does not implement privacy tags or implements them differently. @@ -2966,12 +2966,13 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) //create profile link $profile = str_replace(',','%2c',$profile); $url = $profile; +/* if($termtype === TERM_FORUM) { $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } - else { - // ( $termtype === TERM_MENTION ) +*/ + if ($termtype === TERM_MENTION) { $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } @@ -3032,12 +3033,13 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) //create profile link $profile = str_replace(',','%2c',$profile); $url = $profile; +/* if($termtype === TERM_FORUM) { $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } - else { - // ( $termtype === TERM_MENTION ) +*/ + if ($termtype === TERM_MENTION) { $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); } |