mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[feature/merging-style-components] Moving template initialization out of style

Browse Source 
Moving template initialization out of style constructor

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin
2012-03-31 18:10:00 +03:00
parent 0540509f14
commit 17989c17a0
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/style/style.php
View File

@@ -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;
}
/**