Merge remote-tracking branch 'friendika/master'

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index a60d09ce8b1fdab2bd32e5e1d2fd7d50ca6eeda7..4d6eafafa5f28acccef5f7285c28e7d0211aefba 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -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);
        
 }