diff options
| author | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
| commit | 67d8afb9d18df137fddc991443f9b796b5821210 (patch) | |
| tree | c9f505934f64e6bfa30a9cab64f6732c8ea9537d /include/oembed.php | |
| parent | c4aeb57fcda6253fd9ca91b5177a17b97e3c9b70 (diff) | |
| parent | f4a80fcf2474a13b2d733f59f1a928b40841d83c (diff) | |
| download | volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.gz volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.bz2 volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.zip | |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'include/oembed.php')
| -rwxr-xr-x[-rw-r--r--] | include/oembed.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/oembed.php b/include/oembed.php index 1f45d2814..e2504b7eb 100644..100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -65,7 +65,8 @@ function oembed_fetch_url($embedurl){ } function oembed_format_object($j){ - $embedurl = $j->embedurl; + $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) { @@ -78,6 +79,7 @@ function oembed_format_object($j){ $th=120; $tw = $th*$tr; $tpl=get_markup_template('oembed_video.tpl'); $ret.=replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$embedurl'=>$embedurl, '$escapedhtml'=>base64_encode($jhtml), '$tw'=>$tw, |