Merge pull request #8036 from nupplaphil/task/redundant_system_call

[friendica.git] / src / Content / OEmbed.php

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 144ac4ca53f4a365cdfc55109e478137f51ce249..42748d69ba6dc1af2cf73a7377295368da59dbc6 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -15,8 +15,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -83,8 +83,7 @@ class OEmbed
 
                        if (!in_array($ext, $noexts)) {
                                // try oembed autodiscovery
-                               $redirects = 0;
-                               $html_text = Network::fetchUrl($embedurl, false, $redirects, 15, 'text/*');
+                               $html_text = Network::fetchUrl($embedurl, false, 15, 'text/*');
                                if ($html_text) {
                                        $dom = @DOMDocument::loadHTML($html_text);
                                        if ($dom) {
@@ -181,7 +180,6 @@ class OEmbed
                                        $tw = $th * $tr;
                                        $tpl = Renderer::getMarkupTemplate('oembed_video.tpl');
                                        $ret .= Renderer::replaceMacros($tpl, [
-                                               '$baseurl' => System::baseUrl(),
                                                '$embedurl' => $oembed->embed_url,
                                                '$escapedhtml' => base64_encode($oembed->html),
                                                '$tw' => $tw,
@@ -370,14 +368,12 @@ class OEmbed
         */
        private static function iframe($src, $width, $height)
        {
-               $a = \get_app();
-
                if (!$height || strstr($height, '%')) {
                        $height = '200';
                }
                $width = '100%';
 
-               $src = System::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src);
+               $src = DI::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src);
                return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $src . '" allowfullscreen scrolling="no" frameborder="no">' . L10n::t('Embedded content') . '</iframe>';
        }