aboutsummaryrefslogtreecommitdiffstats
path: root/include/oembed.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-23 23:46:43 -0800
committerfriendica <info@friendica.com>2014-01-23 23:46:43 -0800
commit34906049269853f58ab70f4a64441f3f8f1f2c5b (patch)
tree3b9feebf49c0c4cd4d4937a9e98f402c0202b71b /include/oembed.php
parent357ddd1bf708bfa1c3973bf9a69a333b3338a5ce (diff)
downloadvolse-hubzilla-34906049269853f58ab70f4a64441f3f8f1f2c5b.tar.gz
volse-hubzilla-34906049269853f58ab70f4a64441f3f8f1f2c5b.tar.bz2
volse-hubzilla-34906049269853f58ab70f4a64441f3f8f1f2c5b.zip
add zid to audio/video (again)
Diffstat (limited to 'include/oembed.php')
-rwxr-xr-xinclude/oembed.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/oembed.php b/include/oembed.php
index 6946ba4b8..d8671a752 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,12 +1,10 @@
<?php /** @file */
function oembed_replacecb($matches){
-// logger('oembedcb');
+
$embedurl=$matches[1];
$j = oembed_fetch_url($embedurl);
- $s = oembed_format_object($j);
- return $s;//oembed_iframe($s,$j->width,$j->height);
-
-
+ $s = oembed_format_object($j);
+ return $s;
}
@@ -36,8 +34,9 @@ function oembed_fetch_url($embedurl){
if($r)
$zrl = true;
}
- if($zrl)
+ if($zrl) {
$embedurl = zid($embedurl);
+ }
}
else {
// try oembed autodiscovery
@@ -89,6 +88,7 @@ function oembed_format_object($j){
$a = get_app();
$embedurl = $j->embedurl;
$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": {