diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 18:10:00 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 18:10:00 +0300 |
| commit | 17989c17a040a28aeeefcf55f6cca054b28c06ed (patch) | |
| tree | c774bb4f60dba6973fcb095cc27768428ff71cc5 | |
| parent | 0540509f145d7eb9ba1fd4468399b48edcf46d23 (diff) | |
| download | forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.gz forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.bz2 forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.xz forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.zip | |
[feature/merging-style-components] Moving template initialization out of style
Moving template initialization out of style constructor
PHPBB3-10632
| -rw-r--r-- | phpBB/common.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/style/style.php | 7 | ||||
| -rw-r--r-- | phpBB/install/index.php | 4 | ||||
| -rw-r--r-- | tests/template/template_inheritance_test.php | 4 | ||||
| -rw-r--r-- | tests/template/template_test_case.php | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 1e3f787611..c11d39d9a1 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -126,8 +126,8 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro // Initialize style $phpbb_style_resource_locator = new phpbb_style_resource_locator(); $phpbb_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, $phpbb_style_resource_locator, $phpbb_style_path_provider); -$template = $style->template; +$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider); +$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager); $phpbb_subscriber_loader->load(); diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 2cae38022e..612ced8ad6 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,9 +134,9 @@ class bbcode $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); + $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template); $style->set_style(); - $template = $style->template; $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); } diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 4d076a7957..aae200df55 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -210,9 +210,9 @@ 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()); - $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; + $tpl = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $stl = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $tpl); + $this->tpl_msg[$template_lang . $template_file] = $tpl; $fallback_template_path = false; @@ -238,7 +238,6 @@ class messenger } $this->tpl_obj = &$this->tpl_msg[$template_lang . $template_file]; - $this->tpl_obj = $this->tpl_obj->template; $this->vars = &$this->tpl_obj->_rootref; $this->tpl_msg = ''; diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 265a45eca7..539a2642ee 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -25,7 +25,7 @@ class phpbb_style * @var phpbb_style_template Template class. * Handles everything related to templates. */ - public $template; + private $template; /** * @var string phpBB root path @@ -66,8 +66,9 @@ class phpbb_style * @param user $user current user * @param phpbb_style_resource_locator $locator style resource locator * @param phpbb_style_path_provider $provider style path provider + * @param phpbb_style_template $template template */ - public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider) + public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_style_template $template) { $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; @@ -75,7 +76,7 @@ class phpbb_style $this->user = $user; $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); + $this->template = $template; } /** diff --git a/phpBB/install/index.php b/phpBB/install/index.php index fdce7234e5..6c32a322f8 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -204,10 +204,10 @@ $config = new phpbb_config(array( $phpbb_style_resource_locator = new phpbb_style_resource_locator(); $phpbb_style_path_provider = new phpbb_style_path_provider(); -$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider); +$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider); +$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $style->set_ext_dir_prefix('adm/'); $style->set_custom_style('admin', '../adm/style', ''); -$template = $style->template; $template->assign_var('T_ASSETS_PATH', '../assets'); $template->assign_var('T_TEMPLATE_PATH', '../adm/style'); diff --git a/tests/template/template_inheritance_test.php b/tests/template/template_inheritance_test.php index aa527a3eb5..3f5ec53953 100644 --- a/tests/template/template_inheritance_test.php +++ b/tests/template/template_inheritance_test.php @@ -73,8 +73,8 @@ class phpbb_template_template_inheritance_test extends phpbb_template_template_t $this->parent_template_path = dirname(__FILE__) . '/parent_templates'; $this->style_resource_locator = new phpbb_style_path_provider(); $this->style_provider = new phpbb_style_path_provider(); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider); + $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider); + $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); $this->style->set_custom_style('tests', array($this->template_path, $this->parent_template_path), ''); - $this->template = $this->style->template; } } diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index f324736ba4..a2aedec41d 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -66,9 +66,9 @@ class phpbb_template_template_test_case extends phpbb_test_case $this->template_path = dirname(__FILE__) . '/templates'; $this->style_resource_locator = new phpbb_style_path_provider(); $this->style_provider = new phpbb_style_path_provider(); - $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider); + $this->template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider); + $this->style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $this->style_resource_locator, $this->style_provider, $this->template); $this->style->set_custom_style('tests', $this->template_path, ''); - $this->template = $this->style->template; } protected function setUp() |