X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FRender%2FFriendicaSmarty.php;h=deabd3baf2c0e0a8c6f5bba0dcfe0b66f0364887;hb=9fad4abcec5206974891145810a613a03d5a7cd1;hp=278fe1f9388cfdcde84a8440c18aa01d89e2d66b;hpb=e5a5a7dc7bd8888897e8959a89cc21922580e5e4;p=friendica.git

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 278fe1f938..deabd3baf2 100644
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,56 +1,59 @@
-<?php
-/**
- * @file src/Render/FriendicaSmarty.php
- */
-namespace Friendica\Render;
-
-use Smarty;
-
-/**
- * Friendica extension of the Smarty3 template engine
- *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
- */
-class FriendicaSmarty extends Smarty
-{
-	const SMARTY3_TEMPLATE_FOLDER = 'templates';
-
-	public $filename;
-
-	function __construct()
-	{
-		parent::__construct();
-
-		$a = get_app();
-		$theme = current_theme();
-
-		// 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")) {
-			$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
-		}
-
-		$template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
-		$this->setTemplateDir($template_dirs);
-
-		$this->setCompileDir('view/smarty3/compiled/');
-		$this->setConfigDir('view/smarty3/config/');
-		$this->setCacheDir('view/smarty3/cache/');
-
-		$this->left_delimiter = $a->get_template_ldelim('smarty3');
-		$this->right_delimiter = $a->get_template_rdelim('smarty3');
-
-		// Don't report errors so verbosely
-		$this->error_reporting = E_ALL & ~E_NOTICE;
-	}
-
-	function parsed($template = '')
-	{
-		if ($template) {
-			return $this->fetch('string:' . $template);
-		}
-		return $this->fetch('file:' . $this->filename);
-	}
-
+<?php
+/**
+ * @file src/Render/FriendicaSmarty.php
+ */
+namespace Friendica\Render;
+
+use Smarty;
+use Friendica\Core\Renderer;
+
+/**
+ * Friendica extension of the Smarty3 template engine
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class FriendicaSmarty extends Smarty
+{
+	const SMARTY3_TEMPLATE_FOLDER = 'templates';
+
+	public $filename;
+
+	function __construct()
+	{
+		parent::__construct();
+
+		$a = \get_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 (!empty($a->theme_info['extends'])) {
+			$template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
+		}
+
+		$template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
+		$this->setTemplateDir($template_dirs);
+
+		$this->setCompileDir('view/smarty3/compiled/');
+		$this->setConfigDir('view/smarty3/config/');
+		$this->setCacheDir('view/smarty3/cache/');
+
+		$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;
+	}
+
+	function parsed($template = '')
+	{
+		if ($template) {
+			return $this->fetch('string:' . $template);
+		}
+		return $this->fetch('file:' . $this->filename);
+	}
+
 }
\ No newline at end of file