Merge pull request #8070 from nupplaphil/bug/8069-logout

[friendica.git] / src / Core / Renderer.php

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index c687a67283e1aba41a67672d7bbda284c2c38e58..32247310cf907e40c5929cb87305795154f65729 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -61,10 +61,9 @@ class Renderer
        public static function replaceMacros($s, array $vars = [])
        {
                $stamp1 = microtime(true);
-               $a = DI::app();
 
                // pass $baseurl to all templates if it isn't set
-               $vars = array_merge(['$baseurl' => $a->getBaseURL()], $vars);
+               $vars = array_merge(['$baseurl' => DI::baseUrl()->get()], $vars);
 
                $t = self::getTemplateEngine();
 
@@ -75,7 +74,7 @@ class Renderer
                        exit();
                }
 
-               $a->getProfiler()->saveTimestamp($stamp1, "rendering", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack());
 
                return $output;
        }
@@ -102,7 +101,7 @@ class Renderer
                        exit();
                }
 
-               $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
                return $template;
        }