diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
| commit | 4fcdada4320d5d5619eb3a1f517d0fea6b26857b (patch) | |
| tree | bc2ba3aac0a08c1464718f688be8080d0dff6d2c /include/oembed.php | |
| parent | 5bae7159cc7b182e40229bb6d547ccf303eb4282 (diff) | |
| parent | fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313 (diff) | |
| download | volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.gz volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.bz2 volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x | include/oembed.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/oembed.php b/include/oembed.php index 5c3c595f5..cc71f9757 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -1,6 +1,6 @@ <?php function oembed_replacecb($matches){ - logger('oembedcb'); +// logger('oembedcb'); $embedurl=$matches[1]; $j = oembed_fetch_url($embedurl); $s = oembed_format_object($j); @@ -14,6 +14,9 @@ function oembed_fetch_url($embedurl){ $txt = Cache::get($embedurl); + // These media files should now be caught in bbcode.php + // left here as a fallback in case this is called from another source + $noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm"); $ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION); @@ -62,7 +65,7 @@ function oembed_fetch_url($embedurl){ function oembed_format_object($j){ $embedurl = $j->embedurl; - $jhtml = oembed_iframe($j->embedurl,$j->width,$j->height ); + $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) ); $ret="<span class='oembed ".$j->type."'>"; switch ($j->type) { case "video": { |