diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-30 16:21:02 -0700 |
| commit | 179f41475b555d0a3314d779d0d7423f66f0fb95 (patch) | |
| tree | 8664f91f4fa58765cc34333b248c34b75ab91758 /phpBB/includes/bbcode.php | |
| parent | af2ad7a162d7b4cf4bf617e97f601c6cb7d406d0 (diff) | |
| parent | 213e7563ad4565b322680ce2f3526a7130d2a90e (diff) | |
| download | forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.gz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.bz2 forums-179f41475b555d0a3314d779d0d7423f66f0fb95.tar.xz forums-179f41475b555d0a3314d779d0d7423f66f0fb95.zip | |
Merge pull request #1735 from nickvergessen/ticket/11852
Ticket/11852 filesystem class must not depend on a web request
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index cd2ca7ffce..c4076a0120 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -126,13 +126,13 @@ class bbcode */ function bbcode_cache_init() { - global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_filesystem; + global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper; if (empty($this->template_filename)) { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); + $template = new phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); $template->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); |