diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 17:38:30 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 17:38:30 +0300 |
| commit | 360312f599edd852e14fcd162552e19dd2d278a6 (patch) | |
| tree | 89202a7ba57cd9c469b2d21fd4d6c432b410dfb7 /phpBB/includes | |
| parent | 961199755200668790b243447eac6bf3374b0bb6 (diff) | |
| download | forums-360312f599edd852e14fcd162552e19dd2d278a6.tar forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.gz forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.bz2 forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.xz forums-360312f599edd852e14fcd162552e19dd2d278a6.zip | |
[feature/merging-style-components] Initializing locator and provider separately
Moving locator and path provider initialization out of style class
PHPBB3-10632
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/bbcode.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/style/style.php | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 5e3bfed5ec..2cae38022e 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,11 +132,13 @@ class bbcode { $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); - $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager); + $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()); + $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); $style->set_style(); $template = $style->template; $template->set_filenames(array('bbcode.html' => 'bbcode.html')); - $this->template_filename = $style->locator->get_source_file_for_handle('bbcode.html'); + $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); } $bbcode_ids = $rowset = $sql = array(); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a5e7ad75ca..4d076a7957 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -208,7 +208,9 @@ class messenger // tpl_msg now holds a template object we can use to parse the template file if (!isset($this->tpl_msg[$template_lang . $template_file])) { - $this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager); + $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()); + $this->tpl_msg[$template_lang . $template_file] = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); $stl = &$this->tpl_msg[$template_lang . $template_file]; $tpl = $stl->template; diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 5dee0a138c..265a45eca7 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -50,9 +50,8 @@ class phpbb_style /** * Style resource locator * @var phpbb_style_resource_locator - * This item is temporary public, until locate() function is implemented */ - public $locator; + private $locator; /** * Style path provider @@ -65,20 +64,17 @@ class phpbb_style * * @param string $phpbb_root_path phpBB root path * @param user $user current user - * @param phpbb_extension_manager $phpbb_extension_manager extension manager. Set it to false if extension manager should not be used. + * @param phpbb_style_resource_locator $locator style resource locator + * @param phpbb_style_path_provider $provider style path provider */ - public function __construct($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager = false) + public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider) { $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; $this->config = $config; $this->user = $user; - $this->locator = new phpbb_style_resource_locator(); - $this->provider = new phpbb_style_path_provider(); - if ($phpbb_extension_manager !== false) - { - $this->provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, $this->provider); - } + $this->locator = $locator; + $this->provider = $provider; $this->template = new phpbb_style_template($this->phpbb_root_path, $this->phpEx, $this->config, $this->user, $this->locator, $this->provider); } |