X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FRender%2FFriendicaSmarty.php;h=2b06c88c916b16d66c88822211de7d0aee433e7f;hb=2ec3a97393959e42d450e074271d2d622d25701f;hp=e544a76d1bd4fb562fbf8a82f27798bd3bd09b07;hpb=7d5494dd67f58e1fc63c6571946e26290092321c;p=friendica.git

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index e544a76d1b..2b06c88c91 100644
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,16 +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
 {
@@ -22,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 . "/"];
 		}
 
@@ -42,6 +58,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;
 	}