diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-26 12:15:38 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-10-26 12:15:38 +0200 |
| commit | dc212de9606422be6e912a0bb7f3569192942938 (patch) | |
| tree | 5a253e3b57d14751214513a029d84699f5ad5b21 /include/bbcode.php | |
| parent | bed0043b30c219a08aa0b352923299ea153d515c (diff) | |
| parent | 6d6136cdb5a2149037c3cf315b3fa81a72bd7d55 (diff) | |
| download | volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.gz volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.bz2 volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.zip | |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index d7b64c0cf..4d6eafafa 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -57,6 +57,7 @@ function bbcode($Text,$preserve_nl = false) { // Perform URL Search + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text); $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text); |