Read the config at another place
This commit is contained in:
parent
ff677a1b27
commit
63e1ad7dba
2 changed files with 8 additions and 6 deletions
|
@ -23,7 +23,6 @@ namespace Friendica\Render;
|
||||||
|
|
||||||
use Smarty;
|
use Smarty;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\DI;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Friendica extension of the Smarty3 template engine
|
* Friendica extension of the Smarty3 template engine
|
||||||
|
@ -34,7 +33,7 @@ class FriendicaSmarty extends Smarty
|
||||||
|
|
||||||
public $filename;
|
public $filename;
|
||||||
|
|
||||||
public function __construct(string $theme, array $theme_info, string $work_dir)
|
public function __construct(string $theme, array $theme_info, string $work_dir, bool $use_sub_dirs)
|
||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
@ -65,7 +64,7 @@ class FriendicaSmarty extends Smarty
|
||||||
* RAM available + have enabled caching inode tables (aka.
|
* RAM available + have enabled caching inode tables (aka.
|
||||||
* "descriptors"). Still it won't hurt you.
|
* "descriptors"). Still it won't hurt you.
|
||||||
*/
|
*/
|
||||||
$this->setUseSubDirs(DI::config()->get('smarty3', 'use_sub_dirs'));
|
$this->setUseSubDirs($use_sub_dirs);
|
||||||
|
|
||||||
$this->left_delimiter = Renderer::getTemplateLeftDelimiter();
|
$this->left_delimiter = Renderer::getTemplateLeftDelimiter();
|
||||||
$this->right_delimiter = Renderer::getTemplateRightDelimiter();
|
$this->right_delimiter = Renderer::getTemplateRightDelimiter();
|
||||||
|
|
|
@ -46,8 +46,11 @@ final class FriendicaSmartyEngine extends TemplateEngine
|
||||||
{
|
{
|
||||||
$this->theme = $theme;
|
$this->theme = $theme;
|
||||||
$this->theme_info = $theme_info;
|
$this->theme_info = $theme_info;
|
||||||
|
|
||||||
$work_dir = DI::config()->get('smarty3', 'config_dir');
|
$work_dir = DI::config()->get('smarty3', 'config_dir');
|
||||||
$this->smarty = new FriendicaSmarty($this->theme, $this->theme_info, $work_dir);
|
$use_sub_dirs = DI::config()->get('smarty3', 'use_sub_dirs');
|
||||||
|
|
||||||
|
$this->smarty = new FriendicaSmarty($this->theme, $this->theme_info, $work_dir, $use_sub_dirs);
|
||||||
|
|
||||||
if (!is_writable($work_dir)) {
|
if (!is_writable($work_dir)) {
|
||||||
$admin_message = DI::l10n()->t('The folder %s must be writable by webserver.', $work_dir);
|
$admin_message = DI::l10n()->t('The folder %s must be writable by webserver.', $work_dir);
|
||||||
|
|
Loading…
Reference in a new issue