Merge pull request #8263 from annando/remote-follow

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

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 2052aa9e87a6f5627948d99d18b6464dcb3af8a9..2b06c88c916b16d66c88822211de7d0aee433e7f 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,15 +1,32 @@
 <?php
 /**
- * @file src/Render/FriendicaSmarty.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Render;
 
+use Friendica\DI;
 use Smarty;
+use Friendica\Core\Renderer;
 
 /**
  * Friendica extension of the Smarty3 template engine
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class FriendicaSmarty extends Smarty
 {
@@ -21,13 +38,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 . "/"];
                }
 
@@ -38,8 +55,10 @@ class FriendicaSmarty extends Smarty
                $this->setConfigDir('view/smarty3/config/');
                $this->setCacheDir('view/smarty3/cache/');
 
-               $this->left_delimiter = $a->getTemplateLeftDelimiter('smarty3');
-               $this->right_delimiter = $a->getTemplateRightDelimiter('smarty3');
+               $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;