diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-11 20:47:11 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-11 20:47:11 +0530 |
| commit | 11974b4d948ae5d9b9fb53970838463bd88bb9f6 (patch) | |
| tree | 426724e218a2fcaf3a1a2eedf6ffa591299755ee /include/oembed.php | |
| parent | 079fdecff1f4daa534045f4bd857e6ae6324474d (diff) | |
| parent | afa88154114d5632cb13e7c3f56143cccdfd7daa (diff) | |
| download | volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.tar.gz volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.tar.bz2 volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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, |