diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 17:43:57 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 17:43:57 -0500 |
| commit | 2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0 (patch) | |
| tree | 8ee6b60b3c4687a36b8d100403ad0a1ad569acd0 /phpBB/includes | |
| parent | 586e8cbd97b4e2537f69ebe04b0c9d24fc090a4c (diff) | |
| parent | 93222cf396192cc4e2d9a4dc741c60efda21404d (diff) | |
| download | forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.gz forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.bz2 forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.xz forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop:
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11265] Add assertions for board installation success.
[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
[ticket/10975] Add a test for viewing a profile.
[ticket/10975] Test restricting by first character.
[ticket/10975] Avoid rewriting global config twice.
[ticket/10975] Test memberlist, not user creation.
[ticket/10975] Some quick tests to check the memberlist behaviour
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a33d7f0aa3..d0a02567ad 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -210,7 +210,7 @@ class messenger { $style_resource_locator = new phpbb_style_resource_locator(); $style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); - $tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $extension_manager); + $tpl = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager); $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl); $this->tpl_msg[$template_lang . $template_file] = $tpl; |