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

Merge pull request #11675 from Quix0r/features/smarty-sub-directories 

Enabled sub-directories for compiled/cache Smarty3 files
This commit is contained in:
Hypolite Petovan 2022-06-23 09:06:06 -04:00 committed by GitHub
parent b2aee2cf29 589d0360a4
commit 859af16cca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Render/FriendicaSmarty.php
View File

@ -39,12 +39,12 @@ class FriendicaSmarty extends Smarty
// setTemplateDir can be set to an array, which Smarty will parse in order. // setTemplateDir can be set to an array, which Smarty will parse in order.
// The order is thus very important here // The order is thus very important here
$template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; $template_dirs = ['theme' => "view/theme/$theme/" . self::SMARTY3_TEMPLATE_FOLDER . '/'];
if (!empty($theme_info['extends'])) { if (!empty($theme_info['extends'])) {
$template_dirs = $template_dirs + ['extends' => "view/theme/" . $theme_info["extends"] . "/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; $template_dirs = $template_dirs + ['extends' => 'view/theme/' . $theme_info['extends'] . '/' . self::SMARTY3_TEMPLATE_FOLDER . '/'];
} }
$template_dirs = $template_dirs + ['base' => "view/" . self::SMARTY3_TEMPLATE_FOLDER . "/"]; $template_dirs = $template_dirs + ['base' => 'view/' . self::SMARTY3_TEMPLATE_FOLDER . '/'];
$this->setTemplateDir($template_dirs); $this->setTemplateDir($template_dirs);
$this->setCompileDir('view/smarty3/compiled/'); $this->setCompileDir('view/smarty3/compiled/');

13
src/Render/FriendicaSmartyEngine.php
View File

@ -48,6 +48,19 @@ final class FriendicaSmartyEngine extends TemplateEngine
$this->theme_info = $theme_info; $this->theme_info = $theme_info;
$this->smarty = new FriendicaSmarty($this->theme, $this->theme_info); $this->smarty = new FriendicaSmarty($this->theme, $this->theme_info);
/*
* Enable sub-directory splitting for reducing directory descriptor
* size. The default behavior is to put all compiled/cached files into
* one single directory. Under Linux and EXT4 (and maybe other FS) this
* will increase the descriptor's size (which contains information
* about entries inside the described directory. If the descriptor is
* getting to big, the system will slow down as it has to read the
* whole directory descriptor all over again (unless you have tons of
* RAM available + have enabled caching inode tables (aka.
* "descriptors"). Still it won't hurt you.
*/
$this->smarty->setUseSubDirs(true);
if (!is_writable(DI::basePath() . '/view/smarty3')) { if (!is_writable(DI::basePath() . '/view/smarty3')) {
$admin_message = DI::l10n()->t('The folder view/smarty3/ must be writable by webserver.'); $admin_message = DI::l10n()->t('The folder view/smarty3/ must be writable by webserver.');
DI::logger()->critical($admin_message); DI::logger()->critical($admin_message);