diff options
author | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-03-11 01:03:30 -0700 |
commit | a40c19d19d31bba3fe037a9778c521461e2b0290 (patch) | |
tree | 8c09cefac7bfb25360c19f212b02b0f46a79480e /include/bbcode.php | |
parent | bfd123c59a61be1d667648263aa44c4a9e14a5fc (diff) | |
parent | 0014cf4ff232328c3e3d0993eb8e9893a7c16f54 (diff) | |
download | volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.gz volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.tar.bz2 volse-hubzilla-a40c19d19d31bba3fe037a9778c521461e2b0290.zip |
Merge branch 'master' into openid
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 6b8cb941f..aa6641ca2 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -864,7 +864,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); - $Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm#](.*?)\>/ism",'<$1$2="">',$Text); + $Text = preg_replace("/\<(.*?)(src|href)=\"[^zhfm#](.*?)\>/ism",'<$1$2="">',$Text); $Text = bb_replace_images($Text,$saved_images); |