X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FRenderer.php;h=8844f26881c35183e84874ccfd5431881415a00e;hb=7e2e2f425e7077cf62e214997c8a3fe3c1cb0106;hp=2ca91b4b6ce3d72818467fc5387777f431e504d7;hpb=21a055f670149e67f2ad03da43f590c5329822e2;p=friendica.git diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php index 2ca91b4b6c..8844f26881 100644 --- 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. @@ -56,6 +56,7 @@ class Renderer extends BaseObject * @param array $vars key value pairs (search => replace) * * @return string substituted string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function replaceMacros($s, $vars) { @@ -73,19 +74,20 @@ class Renderer extends BaseObject 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 "
" . __FUNCTION__ . ": " . $e->getMessage() . "
"; - 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() {