diff options
| author | Friendika <info@friendika.com> | 2011-10-26 12:51:08 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-26 12:51:08 -0700 |
| commit | 1aba538c96628468b84136386496ccc69050e810 (patch) | |
| tree | 102830d438afcc8552db79a9284dc1555c8f9247 /include/bbcode.php | |
| parent | 9f5d7b254b4edef7e7d2ffa14eb7c3c03ea516fe (diff) | |
| parent | 6a8b96709e13b04a0657c25b4538c160e2118131 (diff) | |
| download | volse-hubzilla-1aba538c96628468b84136386496ccc69050e810.tar.gz volse-hubzilla-1aba538c96628468b84136386496ccc69050e810.tar.bz2 volse-hubzilla-1aba538c96628468b84136386496ccc69050e810.zip | |
Merge branch 'pull'
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 a60d09ce8..4d6eafafa 100644 --- 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); } |