Merge pull request #11838 from annando/asynchronous-conversation

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

diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php
index 6fc8f4480676eb892583c7f113968ff2bd4fc243..9fe3bf98833d00376196849e55a37a82793ca13f 100644 (file)
--- a/src/Render/FriendicaSmartyEngine.php
+++ b/src/Render/FriendicaSmartyEngine.php
@@ -46,10 +46,11 @@ final class FriendicaSmartyEngine extends TemplateEngine
        {
                $this->theme = $theme;
                $this->theme_info = $theme_info;
-               $this->smarty = new FriendicaSmarty($this->theme, $this->theme_info);
+               $work_dir = DI::config()->get('smarty3', 'config_dir');
+               $this->smarty = new FriendicaSmarty($this->theme, $this->theme_info, $work_dir);
 
-               if (!is_writable(DI::basePath() . '/view/smarty3')) {
-                       $admin_message = DI::l10n()->t('The folder view/smarty3/ must be writable by webserver.');
+               if (!is_writable($work_dir)) {
+                       $admin_message = DI::l10n()->t('The folder %s must be writable by webserver.', $work_dir);
                        DI::logger()->critical($admin_message);
                        $message = DI::app()->isSiteAdmin() ?
                                $admin_message :
@@ -69,7 +70,7 @@ final class FriendicaSmartyEngine extends TemplateEngine
        /**
         * @inheritDoc
         */
-       public function replaceMacros(string $template, array $vars)
+       public function replaceMacros(string $template, array $vars): string
        {
                if (!Strings::startsWith($template, self::FILE_PREFIX)) {
                        $template = self::STRING_PREFIX . $template;