Merge pull request #1659 from annando/1506-ostatus-enclosures

Many OStatus improvements

diff --git a/include/bbcode.php b/include/bbcode.php
index 32265363cc156aafde1d778688f0b79a854b41d5..6c5a400ddc307a069ac67a56a57f09c0fc668017 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1203,7 +1203,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 
        // 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)=\"(?!http|ftp|mailto|cid)(.*?)\>/ism",'<$1$2="">',$Text);
+       $Text = preg_replace("/\<([^>]*?)(src|href)=\"(?!http|ftp|mailto|cid)(.*?)\>/ism",'<$1$2="">',$Text);
 
        if($saved_image)
                $Text = bb_replace_images($Text, $saved_image);