mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 23:37:39 +02:00
Code Issues Releases Wiki Activity

[ticket/11832] Fix INCLUDE(JS/CSS)

Browse Source 
PHPBB3-11832
This commit is contained in:
Nathan Guse
2013-09-13 10:58:03 -05:00
parent 21624e79fc
commit b4a374dc73
21 changed files with 170 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/bbcode.php
View File

@@ -126,13 +126,13 @@ class bbcode
*/
function bbcode_cache_init()
{
global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager;
global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_filesystem;
if (empty($this->template_filename))
{
$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
$template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
$template = new phpbb_template_twig($phpbb_filesystem, $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');

9
phpBB/includes/functions.php
View File

@@ -1070,7 +1070,14 @@ function phpbb_clean_path($path)
global $phpbb_root_path, $phpEx;
require($phpbb_root_path . 'includes/filesystem.' . $phpEx);
}
$phpbb_filesystem = new phpbb_filesystem();
$phpbb_filesystem = new phpbb_filesystem(
new phpbb_symfony_request(
new phpbb_request()
),
$phpbb_root_path,
$phpEx
);
}
return $phpbb_filesystem->clean_path($path);

4
phpBB/includes/functions_messenger.php
View File

@@ -626,14 +626,14 @@ class messenger
*/
protected function setup_template()
{
global $config, $phpbb_root_path, $phpEx, $user, $phpbb_extension_manager;
global $config, $phpbb_filesystem, $user, $phpbb_extension_manager;
if ($this->template instanceof phpbb_template)
{
return;
}
$this->template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
$this->template = new phpbb_template_twig($phpbb_filesystem, $config, $user, new phpbb_template_context(), $phpbb_extension_manager);
}
/**