clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11895 from annando/smarty-sub-dir 

Smarty: Configuration added to store without sub directories
This commit is contained in:
Philipp 2022-09-09 08:20:04 +02:00 committed by GitHub
parent 7da43fe28a 63e1ad7dba
commit 2123b4d071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Render/FriendicaSmarty.php
View File

@ -33,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();
@ -64,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(true); $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();

9
src/Render/FriendicaSmartyEngine.php
View File

@ -44,10 +44,13 @@ final class FriendicaSmartyEngine extends TemplateEngine
*/ */
public function __construct(string $theme, array $theme_info) public function __construct(string $theme, array $theme_info)
{ {
$this->theme = $theme; $this->theme = $theme;
$this->theme_info = $theme_info; $this->theme_info = $theme_info;
$work_dir = DI::config()->get('smarty3', 'config_dir');
$this->smarty = new FriendicaSmarty($this->theme, $this->theme_info, $work_dir); $work_dir = DI::config()->get('smarty3', 'config_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);

5
static/defaults.config.php
View File

@ -714,5 +714,10 @@ return [
// config_dir (String) // config_dir (String)
// Base working directory for the templating engine, must be writeable by the webserver user // Base working directory for the templating engine, must be writeable by the webserver user
'config_dir' => 'view/smarty3', 'config_dir' => 'view/smarty3',
// use_sub_dirs (Boolean)
// By default the template cache is stored in several sub directories.
//
'use_sub_dirs' => true,
], ],
]; ];