aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-01-24 13:34:57 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-01-24 13:34:57 +0100
commit35918a9f1fd7539156fe4e5edaf2542da0c9931a (patch)
tree17e0d658f3e4aebb79fd3bcc3f3e27880b740dcf /include/bbcode.php
parent4198efe03570606b35f3aba6cdf7f80de20384f4 (diff)
parent163e614a3bcac5365e9756ed88581689916c3cba (diff)
downloadvolse-hubzilla-35918a9f1fd7539156fe4e5edaf2542da0c9931a.tar.gz
volse-hubzilla-35918a9f1fd7539156fe4e5edaf2542da0c9931a.tar.bz2
volse-hubzilla-35918a9f1fd7539156fe4e5edaf2542da0c9931a.zip
Merge branch 'master' of git://github.com/friendika/friendika
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 81b581cdb..9e5f5a371 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -22,7 +22,7 @@ function bbcode($Text) {
// Perform URL Search
- $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$2" >$2</a>', $Text);
+ $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]+)/", ' <a href="$2" >$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);