diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-18 22:36:13 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-18 22:36:20 -0400 |
| commit | a650da79cb9acbaa9f01565c4cf1001ab7cf7551 (patch) | |
| tree | e09f4d8af05bfef763544c826dd18b2788a2efe9 /phpBB/includes/style/style.php | |
| parent | d4b89a13b1371cb32af2be453ab04d9013d439fa (diff) | |
| parent | ed9a58a6ccea5b9b2685488ff0cfc45f0ccdbeb5 (diff) | |
| download | forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.gz forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.bz2 forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.xz forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.zip | |
Merge PR #761 branch 'naderman/ticket/10756' into develop
* naderman/ticket/10756:
[ticket/10756] Fixing variable declarations in style and template classes
[ticket/10756] Renaming phpbb_style_template to phpbb_template
[ticket/10756] Removing path provider from template class
[ticket/10756] Creating locator interface
[ticket/10756] Renaming template classes
[ticket/10756] Moving template classes
Diffstat (limited to 'phpBB/includes/style/style.php')
| -rw-r--r-- | phpBB/includes/style/style.php | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 5ac61c9f10..3f470015f6 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -22,28 +22,33 @@ if (!defined('IN_PHPBB')) class phpbb_style { /** - * @var phpbb_style_template Template class. + * Template class. * Handles everything related to templates. + * @var phpbb_template */ private $template; /** - * @var string phpBB root path + * phpBB root path + * @var string */ private $phpbb_root_path; /** - * @var phpEx PHP file extension + * PHP file extension + * @var string */ private $phpEx; /** - * @var phpbb_config phpBB config instance + * phpBB config instance + * @var phpbb_config */ private $config; /** - * @var user current user + * Current user + * @var phpbb_user */ private $user; @@ -66,9 +71,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 + * @param phpbb_template $template template */ - public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_style_template $template) + public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_style_resource_locator $locator, phpbb_style_path_provider_interface $provider, phpbb_template $template) { $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; @@ -119,7 +124,7 @@ class phpbb_style $this->template->cachepath = $this->phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $name) . '_'; - $this->template->context = new phpbb_style_template_context(); + $this->template->context = new phpbb_template_context(); if ($template_path !== false) { |