Merge pull request #6767 from MrPetovan/bug/fatal-errors

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

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 44b56fcba373afda90354e624efb2740db7070db..8844f26881c35183e84874ccfd5431881415a00e 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -7,8 +7,8 @@ namespace Friendica\Core;
 
 use Exception;
 use Friendica\BaseObject;
-use Friendica\Core\System;
 use Friendica\Render\FriendicaSmarty;
+use Friendica\Render\ITemplateEngine;
 
 /**
  * @brief This class handles Renderer related functions.
@@ -48,44 +48,46 @@ class Renderer extends BaseObject
                'internal' => '',
                'smarty3' => '}}'
     ];
-    
-    /**
-     * @brief This is our template processor
-     *
-     * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
-     * @param array $r                  key value pairs (search => replace)
-     * 
-     * @return string substituted string
-    */
-    public static function replaceMacros($s, $r)
+
+       /**
+        * @brief This is our template processor
+        *
+        * @param string|FriendicaSmarty $s    The string requiring macro substitution or an instance of FriendicaSmarty
+        * @param array                  $vars key value pairs (search => replace)
+        *
+        * @return string substituted string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        */
+    public static function replaceMacros($s, $vars)
     {
         $stamp1 = microtime(true);
         $a = self::getApp();
 
         // pass $baseurl to all templates
-        $r['$baseurl'] = System::baseUrl();
+        $vars['$baseurl'] = System::baseUrl();
         $t = self::getTemplateEngine();
 
         try {
-            $output = $t->replaceMacros($s, $r);
+            $output = $t->replaceMacros($s, $vars);
         } catch (Exception $e) {
             echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-            killme();
+            exit();
         }
 
-        $a->saveTimestamp($stamp1, "rendering");
+               $a->getProfiler()->saveTimestamp($stamp1, "rendering", System::callstack());
 
         return $output;
     }
 
-    /**
-     * @brief Load a given template $s
-     *
-     * @param string $s     Template to load.
-     * @param string $root  Optional.
-     * 
-     * @return string template.
-     */
+       /**
+        * @brief Load a given template $s
+        *
+        * @param string $s    Template to load.
+        * @param string $root Optional.
+        *
+        * @return string template.
+        * @throws Exception
+        */
     public static function getMarkupTemplate($s, $root = '')
     {
         $stamp1 = microtime(true);
@@ -96,10 +98,10 @@ class Renderer extends BaseObject
             $template = $t->getTemplateFile($s, $root);
         } catch (Exception $e) {
             echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
-            killme();
+            exit();
         }
 
-        $a->saveTimestamp($stamp1, "file");
+        $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
 
         return $template;
     }
@@ -129,7 +131,7 @@ class Renderer extends BaseObject
         * If $name is not defined, return engine defined by theme,
         * or default
         *
-        * @return object Template Engine instance
+        * @return ITemplateEngine Template Engine instance
         */
        public static function getTemplateEngine()
        {