diff options
| author | Mario <mario@mariovavti.com> | 2023-03-03 08:49:18 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2023-03-03 08:49:18 +0000 |
| commit | ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f (patch) | |
| tree | 2a5c739bf8c06297c64776a0f83374f17b288c56 /include/text.php | |
| parent | da034045cc1bba74287b7c3e83f4a94ff5359150 (diff) | |
| download | volse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.tar.gz volse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.tar.bz2 volse-hubzilla-ec3ba87f3a6cb9cda5f094bb1e62ed6b746f087f.zip | |
Revert "some work on bringing bang tags back for forums"
This reverts commit da034045cc1bba74287b7c3e83f4a94ff5359150.
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/text.php b/include/text.php index 415a51790..d7ffa5550 100644 --- a/include/text.php +++ b/include/text.php @@ -1652,7 +1652,7 @@ function format_hashtags(&$item) { function format_mentions(&$item) { $s = ''; - $terms = isset($item['term']) ? get_terms_oftype($item['term'], [TERM_MENTION, TERM_FORUM]) : []; + $terms = isset($item['term']) ? get_terms_oftype($item['term'], TERM_MENTION) : []; if($terms) { foreach($terms as $t) { if(! isset($t['term'])) @@ -2876,7 +2876,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? @@ -2943,7 +2943,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) // BEGIN mentions - if (in_array($termtype, [TERM_MENTION, TERM_FORUM])) { + if ($termtype === TERM_MENTION) { // The @! tag will alter permissions @@ -3051,15 +3051,8 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) $profile = str_replace(',','%2c',$profile); $url = $profile; - if($termtype === TERM_FORUM) { - $newtag = '!' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; - $body = str_replace('!' . (($exclusive) ? '!' : '') . $name, $newtag, $body); - } - - if ($termtype === TERM_MENTION) { - $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; - $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); - } + $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; + $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); // append tag to str_tags if(! stristr($str_tags,$newtag)) { @@ -3117,12 +3110,12 @@ 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); } - +*/ if ($termtype === TERM_MENTION) { $newtag = '@' . (($exclusive) ? '!' : '') . '[zrl=' . $profile . ']' . $newname . '[/zrl]'; $body = str_replace('@' . (($exclusive) ? '!' : '') . $name, $newtag, $body); |