diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-04-27 22:43:26 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-04-27 22:43:26 +0530 |
| commit | 214ec91a3f2c5fec6cced93f669b3a9725f0e40a (patch) | |
| tree | d05fd4c7e65cc89cf46d8347a2d0e6df135ed864 /include/bbcode.php | |
| parent | f1d84c10458986a0a014f844e784617401764b29 (diff) | |
| parent | 4b92e3543c9af26e590cfecf561ff7483e66e6c9 (diff) | |
| download | volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.gz volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.bz2 volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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)) |