diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 19:15:25 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-12 19:15:25 +0200 |
| commit | ac9dfd023c147d81a3246d6401b0066baf9c5ad8 (patch) | |
| tree | 4c49255db71e8e04789f4410dd8bddeac0e67efa /phpBB/includes/template | |
| parent | e9eeff8b382eee4f8714b47390970474d791ed57 (diff) | |
| parent | 27b550ae66ccc3257eea92a8f7b96e3d9c729a4c (diff) | |
| download | forums-ac9dfd023c147d81a3246d6401b0066baf9c5ad8.tar forums-ac9dfd023c147d81a3246d6401b0066baf9c5ad8.tar.gz forums-ac9dfd023c147d81a3246d6401b0066baf9c5ad8.tar.bz2 forums-ac9dfd023c147d81a3246d6401b0066baf9c5ad8.tar.xz forums-ac9dfd023c147d81a3246d6401b0066baf9c5ad8.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11665' into develop
* EXreaction/ticket/11665:
[ticket/11665] Fix test class name
[ticket/11665] Can't change file names already sent to set_filenames
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/twig/twig.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php index f5638972a3..92a37d1634 100644 --- a/phpBB/includes/template/twig/twig.php +++ b/phpBB/includes/template/twig/twig.php @@ -172,7 +172,7 @@ class phpbb_template_twig implements phpbb_template */ public function set_filenames(array $filename_array) { - $this->filenames = array_merge($filename_array, $this->filenames); + $this->filenames = array_merge($this->filenames, $filename_array); return $this; } |