diff options
| author | MateBartus <mate.bartus@gmail.com> | 2015-05-11 16:59:26 +0200 |
|---|---|---|
| committer | MateBartus <mate.bartus@gmail.com> | 2015-05-11 16:59:26 +0200 |
| commit | 281f2ef2dacc7d635646edb3897fba8ff6f66d25 (patch) | |
| tree | a01b88837fead2fba0f5f28ae1d92759f7a13fcd /phpBB | |
| parent | 7b301e22f32e9209bb4e3ea17a5637a84a4ef908 (diff) | |
| download | forums-281f2ef2dacc7d635646edb3897fba8ff6f66d25.tar forums-281f2ef2dacc7d635646edb3897fba8ff6f66d25.tar.gz forums-281f2ef2dacc7d635646edb3897fba8ff6f66d25.tar.bz2 forums-281f2ef2dacc7d635646edb3897fba8ff6f66d25.tar.xz forums-281f2ef2dacc7d635646edb3897fba8ff6f66d25.zip | |
[ticket/13804] Remove unnecessary array_merge
PHPBB3-13804
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/template/twig/twig.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index ab349cc740..6b3cf32bc8 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -359,12 +359,7 @@ class twig extends \phpbb\template\base if ($this->user instanceof \phpbb\user) { - $vars = array_merge( - $vars, - array( - 'user' => $this->user, - ) - ); + $vars['user'] = $this->user; } // cleanup |