aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-18 19:06:05 -0700
committerfriendica <info@friendica.com>2015-03-18 19:06:05 -0700
commit63683734a21e90149c464f7e9b03e7aedc29868e (patch)
tree5b58e4d227da6638f7a841a5b62a080646e53bba /include/bbcode.php
parent5a7e35fbf8e70f04e4253e5cc2a79925cd3385d1 (diff)
downloadvolse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.gz
volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.tar.bz2
volse-hubzilla-63683734a21e90149c464f7e9b03e7aedc29868e.zip
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.
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 32e5d014f..6f7ef8973 100644
--- 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);