diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-02 20:55:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-02 20:55:25 +0200 |
| commit | cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01 (patch) | |
| tree | ba06fc933cbee5137c304c222485fbb6f620da0d /phpBB/phpbb/template | |
| parent | da9888d04f3a691a73013d9bb2c14a8809012512 (diff) | |
| parent | 6777d462ffb5a45428fc1597e18663224c802af6 (diff) | |
| download | forums-cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01.tar forums-cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01.tar.gz forums-cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01.tar.bz2 forums-cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01.tar.xz forums-cf5ae5abbcacbcbfc920f75ad4f95c8277ec0b01.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/twig/twig.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index dd6117819a..2a8fb76b90 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -158,6 +158,10 @@ class twig extends \phpbb\template\base } $names = $this->get_user_style(); + // Add 'all' folder to $names array + // It allows extensions to load a template file from 'all' folder, + // if a style doesn't include it. + $names[] = 'all'; $paths = array(); foreach ($style_directories as $directory) |