Merge pull request #6055 from zeroadam/FileTagHotFix

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

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 116120ab552474c4dfe3e8132ea995bb76716293..943b91e1f293264782dae575ddf9b8be7d54fa77 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -14,6 +14,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
@@ -120,9 +121,9 @@ class OEmbed
                                        'content' => $json_string,
                                        'created' => DateTimeFormat::utcNow()
                                ], true);
-                               $cache_ttl = CACHE_DAY;
+                               $cache_ttl = Cache::DAY;
                        } else {
-                               $cache_ttl = CACHE_FIVE_MINUTES;
+                               $cache_ttl = Cache::FIVE_MINUTES;
                        }
 
                        Cache::set($cache_key, $json_string, $cache_ttl);
@@ -178,8 +179,8 @@ class OEmbed
 
                                        $th = 120;
                                        $tw = $th * $tr;
-                                       $tpl = get_markup_template('oembed_video.tpl');
-                                       $ret .= replace_macros($tpl, [
+                                       $tpl = Renderer::getMarkupTemplate('oembed_video.tpl');
+                                       $ret .= Renderer::replaceMacros($tpl, [
                                                '$baseurl' => System::baseUrl(),
                                                '$embedurl' => $oembed->embed_url,
                                                '$escapedhtml' => base64_encode($oembed->html),