make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.

2015-03-18 19:06:05 -07:00
parent 5a7e35fbf8
commit 63683734a2
3 changed files with 7 additions and 5 deletions
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -469,7 +469,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {

 	// Perform URL Search

-	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]';
+	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,\@]';

 	if (strpos($Text,'http') !== false) {
 		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" >$2</a>', $Text);