diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-04 09:31:12 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-04-04 09:31:12 +0200 |
| commit | 92156cd8403fa1521ecf3c3f9ed3823c03c73dcd (patch) | |
| tree | 38e7b6573c7162254e56dddcaa1543361ead1dbc /include/bbcode.php | |
| parent | b48e82d12ab3d5ea07f9e8410aacb9c3ae842539 (diff) | |
| parent | 9b50b0e16f2046b91cb4c734c56024524d8b178b (diff) | |
| download | volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.tar.gz volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.tar.bz2 volse-hubzilla-92156cd8403fa1521ecf3c3f9ed3823c03c73dcd.zip | |
Merge remote-tracking branch 'friendika-master/master' into iconpopup
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 4caf18766..44f571450 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" target="external-link">$2</a>', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+\,]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text); $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text); |