diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-23 08:46:57 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-23 08:46:57 +0100 |
| commit | 71294faf2c182a678e5889b2ff9cabed16d83c82 (patch) | |
| tree | d6ad7955921285a374b5dd666153d42a6071e871 /include | |
| parent | 0dc7e0975a7cd02d8c79dda42c836c31d84c9e24 (diff) | |
| parent | 43dc0b4280b00cb66a1ca97341dfe7e795f5988c (diff) | |
| download | volse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.tar.gz volse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.tar.bz2 volse-hubzilla-71294faf2c182a678e5889b2ff9cabed16d83c82.zip | |
Merge branch 'master' of git://github.com/tobiasd/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index ef31f5a66..81b581cdb 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -21,7 +21,8 @@ function bbcode($Text) { // Perform URL Search - $Text = preg_replace("/[^\]\=](https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%]*)/", ' <a href="$1" >$1</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); |