Merge pull request #3088 from beardyunixer/patch-1

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index 5abd03b61769587180e292d9ebdb825e12ddf757..a1945894fcaf3fb877ff36c7e2b5a2ec1e0b7e71 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -165,12 +165,12 @@ function oembed_format_object($j){
                                $th=120; $tw = $th*$tr;
                                $tpl=get_markup_template('oembed_video.tpl');
                                $ret.=replace_macros($tpl, array(
-                                       '$baseurl' => App::get_baseurl(),
-                                       '$embedurl'=>$embedurl,
-                                       '$escapedhtml'=>base64_encode($jhtml),
-                                       '$tw'=>$tw,
-                                       '$th'=>$th,
-                                       '$turl'=>$j->thumbnail_url,
+                                       '$baseurl'     => App::get_baseurl(),
+                                       '$embedurl'    => $embedurl,
+                                       '$escapedhtml' => base64_encode($jhtml),
+                                       '$tw'          => $tw,
+                                       '$th'          => $th,
+                                       '$turl'        => $j->thumbnail_url,
                                ));
 
                        } else {
@@ -255,12 +255,14 @@ function oembed_format_object($j){
  * @see oembed_format_object()
  */
 function oembed_iframe($src, $width, $height) {
+       $a = get_app();
+
        if (!$height || strstr($height,'%')) {
                $height = '200';
        }
        $width = '100%';
 
-       $s = App::get_baseurl() . '/oembed/'.base64url_encode($src);
+       $s = App::get_baseurl() . '/oembed/' . base64url_encode($src);
        return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" allowfullscreen scrolling="no" frameborder="no">' . t('Embedded content') . '</iframe>';
 }