merged 2 if() into one as requested by CR

[friendica.git] / include / oembed.php

diff --git a/include/oembed.php b/include/oembed.php
index dbe934ff6de3c980f91d71ad8d7d8b6460e6b4f7..a1945894fcaf3fb877ff36c7e2b5a2ec1e0b7e71 100755 (executable)
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -149,8 +149,6 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 }
 
 function oembed_format_object($j){
-       $a = get_app();
-
        require_once("mod/proxy.php");
 
        $embedurl = $j->embedurl;
@@ -167,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' => $a->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 {
@@ -264,7 +262,7 @@ function oembed_iframe($src, $width, $height) {
        }
        $width = '100%';
 
-       $s = $a->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>';
 }