Remove next link when there aren't any introductions in Module\Api\Mastodon\FollowReq...

[friendica.git] / src / Render / FriendicaSmarty.php

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index e544a76d1bd4fb562fbf8a82f27798bd3bd09b07..83b6322df2425e1a96a882467121163279e37539 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Render;
 
+use Friendica\DI;
 use Smarty;
 use Friendica\Core\Renderer;
 
@@ -22,13 +23,13 @@ class FriendicaSmarty extends Smarty
        {
                parent::__construct();
 
-               $a = get_app();
+               $a = DI::app();
                $theme = $a->getCurrentTheme();
 
                // setTemplateDir can be set to an array, which Smarty will parse in order.
                // The order is thus very important here
                $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
-               if (x($a->theme_info, "extends")) {
+               if (!empty($a->theme_info['extends'])) {
                        $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
                }
 
@@ -42,6 +43,8 @@ class FriendicaSmarty extends Smarty
                $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
                $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
 
+               $this->escape_html = true;
+
                // Don't report errors so verbosely
                $this->error_reporting = E_ALL & ~E_NOTICE;
        }