diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-05 18:17:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-05 18:17:14 +0200 |
| commit | de687f32ed8df438cb798d98f1a5dda7a5ac76dc (patch) | |
| tree | 346e51469449521e40a25d875bcc3f7b8d7846f7 /phpBB/includes | |
| parent | ba53901ffb734995b42626a71a81a5abaa55f85d (diff) | |
| parent | 51376a43919cba7a5037edb7cc31f18b5950437b (diff) | |
| download | forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.gz forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.bz2 forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.tar.xz forums-de687f32ed8df438cb798d98f1a5dda7a5ac76dc.zip | |
Merge pull request #3432 from Nicofuma/ticket/13638
[ticket/13638] Prepend the assets path phpbb root
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/bbcode.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 53675637a0..150157e275 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -142,6 +142,7 @@ class bbcode new \phpbb\template\context(), new \phpbb\template\twig\environment( $phpbb_container->get('config'), + $phpbb_container->get('filesystem'), $phpbb_container->get('path_helper'), $phpbb_container, $phpbb_container->getParameter('core.root_path') . 'cache/', diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index b0861585ba..4cbe1eb425 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -637,6 +637,7 @@ class messenger new \phpbb\template\context(), new \phpbb\template\twig\environment( $phpbb_container->get('config'), + $phpbb_container->get('filesystem'), $phpbb_container->get('path_helper'), $phpbb_container, $phpbb_container->getParameter('core.root_path') . 'cache/', |