diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-03 06:33:11 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-03 06:33:11 -0400 |
| commit | 2db86b950e78cb01cde659f424c9c01f79edc7a4 (patch) | |
| tree | e57d9a81e15428395c171e17c5b0a05961a876ba /include/bbcode.php | |
| parent | 9619d02be988a5af7746fa5524b17e645f99d40d (diff) | |
| parent | dccdeedb75874ac8a244770cc3be0bf9ee71a0cd (diff) | |
| download | volse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.tar.gz volse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.tar.bz2 volse-hubzilla-2db86b950e78cb01cde659f424c9c01f79edc7a4.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo
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 5bd5301cc..7a7ea8ce6 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -629,7 +629,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) } if($tryoembed) { if (strpos($Text,'[/url]') !== false) { - $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); + $Text = preg_replace_callback("/[^\^]\[url\]([$URLSearchString]*)\[\/url\]/ism", 'tryoembed', $Text); } } if (strpos($Text,'[/url]') !== false) { |