Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

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

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 278fe1f9388cfdcde84a8440c18aa01d89e2d66b..f4c6a8ed27623372428db861cf8a35634c3b51c0 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,56 +1,56 @@
-<?php\r
-/**\r
- * @file src/Render/FriendicaSmarty.php\r
- */\r
-namespace Friendica\Render;\r
-\r
-use Smarty;\r
-\r
-/**\r
- * Friendica extension of the Smarty3 template engine\r
- *\r
- * @author Hypolite Petovan <mrpetovan@gmail.com>\r
- */\r
-class FriendicaSmarty extends Smarty\r
-{\r
-       const SMARTY3_TEMPLATE_FOLDER = 'templates';\r
-\r
-       public $filename;\r
-\r
-       function __construct()\r
-       {\r
-               parent::__construct();\r
-\r
-               $a = get_app();\r
-               $theme = current_theme();\r
-\r
-               // setTemplateDir can be set to an array, which Smarty will parse in order.\r
-               // The order is thus very important here\r
-               $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
-               if (x($a->theme_info, "extends")) {\r
-                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
-               }\r
-\r
-               $template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];\r
-               $this->setTemplateDir($template_dirs);\r
-\r
-               $this->setCompileDir('view/smarty3/compiled/');\r
-               $this->setConfigDir('view/smarty3/config/');\r
-               $this->setCacheDir('view/smarty3/cache/');\r
-\r
-               $this->left_delimiter = $a->get_template_ldelim('smarty3');\r
-               $this->right_delimiter = $a->get_template_rdelim('smarty3');\r
-\r
-               // Don't report errors so verbosely\r
-               $this->error_reporting = E_ALL & ~E_NOTICE;\r
-       }\r
-\r
-       function parsed($template = '')\r
-       {\r
-               if ($template) {\r
-                       return $this->fetch('string:' . $template);\r
-               }\r
-               return $this->fetch('file:' . $this->filename);\r
-       }\r
-\r
+<?php
+/**
+ * @file src/Render/FriendicaSmarty.php
+ */
+namespace Friendica\Render;
+
+use Smarty;
+
+/**
+ * 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 (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);
+       }
+
 }
\ No newline at end of file