diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-14 17:03:12 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-14 17:03:12 +0200 |
| commit | ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc (patch) | |
| tree | 3b0af71583b22d3de171273defba147cf4ea5725 /phpBB/includes/bbcode.php | |
| parent | a26ab86dc63b196c79d86f3da36b8596a7beeb02 (diff) | |
| parent | 281f2ef2dacc7d635646edb3897fba8ff6f66d25 (diff) | |
| download | forums-ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc.tar forums-ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc.tar.gz forums-ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc.tar.bz2 forums-ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc.tar.xz forums-ba9ac01dc0dc5297ce613ff3ca62cec9e5d1a8fc.zip | |
Merge pull request #3581 from MateBartus/ticket/13804
[ticket/13804] Make template's user dependency optional
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 150157e275..24eaddf067 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -138,7 +138,6 @@ class bbcode $template = new \phpbb\template\twig\twig( $phpbb_container->get('path_helper'), $phpbb_container->get('config'), - $phpbb_container->get('user'), new \phpbb\template\context(), new \phpbb\template\twig\environment( $phpbb_container->get('config'), @@ -152,6 +151,7 @@ class bbcode ) ), $phpbb_container->getParameter('core.root_path') . 'cache/', + $phpbb_container->get('user'), $phpbb_container->get('template.twig.extensions.collection'), $phpbb_extension_manager ); |