Merge pull request #11256 from MrPetovan/bug/notices

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

diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 2b06c88c916b16d66c88822211de7d0aee433e7f..50dda5eba1f337fa5067073688deaeada37a1f55 100644 (file)
--- a/src/Render/FriendicaSmarty.php
+++ b/src/Render/FriendicaSmarty.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Render;
 
-use Friendica\DI;
 use Smarty;
 use Friendica\Core\Renderer;
 
@@ -34,26 +33,23 @@ class FriendicaSmarty extends Smarty
 
        public $filename;
 
-       function __construct()
+       function __construct(string $theme, array $theme_info)
        {
                parent::__construct();
 
-               $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 (!empty($a->theme_info['extends'])) {
-                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $a->theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"];
+               if (!empty($theme_info['extends'])) {
+                       $template_dirs = $template_dirs + ['extends' => "view/theme/" . $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->setConfigDir('view/smarty3/');
+               $this->setCacheDir('view/smarty3/');
 
                $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
                $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
@@ -62,14 +58,7 @@ class FriendicaSmarty extends Smarty
 
                // 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);
+               $this->muteUndefinedOrNullWarnings();
        }
-
-}
\ No newline at end of file
+}