aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-12 11:47:34 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-12 11:47:34 -0500
commit7e20b711806abf247209ea0211a45a8083f6ad3b (patch)
treecb0d150d2b4b63cebdb0f960435145abeb92cfbd /phpBB/includes
parent7e4acced8599e7275e20ebab10bdc925ece4baee (diff)
downloadforums-7e20b711806abf247209ea0211a45a8083f6ad3b.tar
forums-7e20b711806abf247209ea0211a45a8083f6ad3b.tar.gz
forums-7e20b711806abf247209ea0211a45a8083f6ad3b.tar.bz2
forums-7e20b711806abf247209ea0211a45a8083f6ad3b.tar.xz
forums-7e20b711806abf247209ea0211a45a8083f6ad3b.zip
[ticket/11665] Can't change file names already sent to set_filenames
PHPBB3-11665
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/template/twig/twig.php2
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;
}