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/functions_messenger.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/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f8b01bc770..5b343e616e 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -626,14 +626,14 @@ class messenger */ protected function setup_template() { - global $config, $phpbb_filesystem, $user, $phpbb_extension_manager; + global $config, $phpbb_path_helper, $user, $phpbb_extension_manager; if ($this->template instanceof \phpbb\template\template) { return; } - $this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager); + $this->template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager); } /** |