Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 05:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2012-07-18 21:03:57 +02:00
commit c8f99a8a66
10 changed files with 1155 additions and 891 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/bbcode.php
View file

@ -404,6 +404,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)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
$Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
if($saved_image)
$Text = bb_replace_images($Text, $saved_image);