diff options
| author | Friendika <info@friendika.com> | 2011-11-12 04:12:03 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-11-12 04:12:03 -0800 |
| commit | 58ba7c3969ce51d0f0f67d602886035230c1f3ae (patch) | |
| tree | d1afcb0fda4964176743d129ace2dc9ad8bd3906 /include | |
| parent | cf82174520c4cc1024f2690e51dc903d663a5661 (diff) | |
| parent | ab6bf767df4a06494b314f7d0c3928a795b81bae (diff) | |
| download | volse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.tar.gz volse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.tar.bz2 volse-hubzilla-58ba7c3969ce51d0f0f67d602886035230c1f3ae.zip | |
Merge branch 'pull'
Diffstat (limited to 'include')
| -rw-r--r-- | include/oembed.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/oembed.php b/include/oembed.php index 3e86627e4..7c0da4594 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -56,7 +56,7 @@ function oembed_fetch_url($embedurl){ function oembed_format_object($j){ $embedurl = $j->embedurl; - $jhtml = oembed_iframe($j->html,$j->width,$j->height ); + $jhtml = oembed_iframe($j->embedurl,$j->width,$j->height ); $ret="<span class='oembed ".$j->type."'>"; switch ($j->type) { case "video": { @@ -116,7 +116,9 @@ function oembed_iframe($src,$width,$height) { $height = intval($height) + 80; $width = intval($width) + 40; - $s = 'data:text/html;base64,' . base64_encode('<html><body>' . $src . '</body></html>'); + $a = get_app(); + + $s = $a->get_baseurl()."/oembed/".base64url_encode($src); return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; } |