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 /phpBB/includes/style | |
| 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
Diffstat (limited to 'phpBB/includes/style')
| -rw-r--r-- | phpBB/includes/style/style.php | 7 |
1 files changed, 4 insertions, 3 deletions
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; } /** |