diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-08 21:02:02 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-17 16:43:38 -0500 |
| commit | da7d888448cba2160b16010b982f886be9cb1bcb (patch) | |
| tree | b8be59b4ddc545a9461fad581f63b12f0e8941b0 /phpBB/includes | |
| parent | d42d71b47d76ab36d2c7a985f0b63c9c4686bfd0 (diff) | |
| download | forums-da7d888448cba2160b16010b982f886be9cb1bcb.tar forums-da7d888448cba2160b16010b982f886be9cb1bcb.tar.gz forums-da7d888448cba2160b16010b982f886be9cb1bcb.tar.bz2 forums-da7d888448cba2160b16010b982f886be9cb1bcb.tar.xz forums-da7d888448cba2160b16010b982f886be9cb1bcb.zip | |
[feature/template-events] Make style names private on template.
PHPBB3-9550
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/style/style.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/includes/style/style.php b/phpBB/includes/style/style.php index 6aec5c6ba4..7d31df9886 100644 --- a/phpBB/includes/style/style.php +++ b/phpBB/includes/style/style.php @@ -135,7 +135,7 @@ class phpbb_style $this->provider->set_styles($paths); $this->locator->set_paths($this->provider); - $this->template->style_names = $names; + $this->template->set_style_names($names); if ($template_path !== false) { diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 4d257d2510..97e23f34e0 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -89,7 +89,7 @@ class phpbb_template * * @var array */ - public $style_names; + private $style_names; /** * Constructor. @@ -124,6 +124,18 @@ class phpbb_template } /** + * Sets the style names corresponding to style hierarchy being compiled + * and/or rendered. + * + * @param array $style_names List of style names in inheritance tree order + * @return null + */ + public function set_style_names(array $style_names) + { + $this->style_names = $style_names; + } + + /** * Clears all variables and blocks assigned to this template. */ public function destroy() |