Merge remote-tracking branch 'friendika/master'

diff --combined include/bbcode.php
index d7b64c0cf1babba270d28d5330017489f3caf8c9,a60d09ce8b1fdab2bd32e5e1d2fd7d50ca6eeda7..4d6eafafa5f28acccef5f7285c28e7d0211aefba
--- 1/include/bbcode.php
--- 2/include/bbcode.php
+++ b/include/bbcode.php
@@@ -19,7 -19,7 +19,7 @@@ function tryoembed($match)
        if ($o->type=="error") return $match[0];
        
        $html = oembed_format_object($o);
 -      return oembed_iframe($html,$o->width,$o->height);
 +      return $html; //oembed_iframe($html,$o->width,$o->height);
        
  }
  
@@@ -57,6 -57,7 +57,7 @@@ function bbcode($Text,$preserve_nl = fa
  
  
        // Perform URL Search
+ 
        $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
        
        $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);