diff options
| -rw-r--r-- | include/bbcode.php | 6 | ||||
| -rw-r--r-- | mod/item.php | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index a315c3e38..961494b16 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -12,13 +12,13 @@ function bbcode($Text) { $Text = nl2br($Text); // Set up the parameters for a URL search string - $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'"; + $URLSearchString = " a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%"; // Set up the parameters for a MAIL search string $MAILSearchString = $URLSearchString . " a-zA-Z0-9\.@"; // Perform URL Search - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="_blank">$1</a>', $Text); - $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" >$1</a>', $Text); + $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" >$2</a>', $Text); //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</a>', $Text); // Perform MAIL Search diff --git a/mod/item.php b/mod/item.php index 75822936a..430500f99 100644 --- a/mod/item.php +++ b/mod/item.php @@ -121,6 +121,11 @@ function item_post(&$a) { if(count($tags)) { foreach($tags as $tag) { + if(strpos($tag,'#') === 0) { + $basetag = substr($tag,1); + $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($basetag) . ']' . $basetag . '[/url]',$body); + continue; + } if(strpos($tag,'@') === 0) { $name = substr($tag,1); if((strpos($name,'@')) || (strpos($name,'http://'))) { |