diff options
| author | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-24 10:38:23 +0200 |
| commit | 912e008ded3d439f7779310eb422e4b871a9b63d (patch) | |
| tree | 61f1960c1ff17e27d0755e40ea7ccb90d0c0d4b1 /include/bbcode.php | |
| parent | e6847cdd3f6faf087dc7e738e1dbae7d70113451 (diff) | |
| parent | fbdb8fc43a3cb03f25102f15a1deaf8408e9122a (diff) | |
| download | volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.gz volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.tar.bz2 volse-hubzilla-912e008ded3d439f7779310eb422e4b871a9b63d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 3697f1fc5..85d310b75 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -298,6 +298,9 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/','&$1;',$Text); + // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); if(strlen($saved_image)) |