diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-04 21:24:40 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-04 21:24:40 -0400 |
| commit | 1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857 (patch) | |
| tree | dc607845d0f94891c81abc0c343115d1dc88b630 /phpBB/includes/template | |
| parent | 13536f2be5e9c26752a6c9c5db19892b3c8e5490 (diff) | |
| download | forums-1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857.tar forums-1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857.tar.gz forums-1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857.tar.bz2 forums-1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857.tar.xz forums-1a6250d8b6b61b09c1713e3d8683a0c1dd8e0857.zip | |
[feature/template-engine] Delete $style_name param from locator's set_custom_template.
This parameter was unused, it was only used by template's set_custom_template
to determine cache file prefix.
PHPBB3-9726
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/locator.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php index 7d0b618be3..d9c95ec4ff 100644 --- a/phpBB/includes/template/locator.php +++ b/phpBB/includes/template/locator.php @@ -114,10 +114,9 @@ class phpbb_template_locator * Note: Templates are still compiled to phpBB's cache directory. * * @param string $template_path Path to template directory - * @param string $template_name Name of template * @param string|bool $fallback_template_path Path to fallback template, or false to disable fallback */ - public function set_custom_template($template_path, $template_name, $fallback_template_path = false) + public function set_custom_template($template_path, $fallback_template_path = false) { // Make sure $template_path has no ending slash if (substr($template_path, -1) == '/') diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 2f360e4df4..6a60ff34d6 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -117,10 +117,9 @@ class phpbb_template */ public function set_custom_template($template_path, $style_name, $fallback_template_path = false) { - $this->locator->set_custom_template($template_path, $style_name, $fallback_template_path); - $template_name = $style_name; + $this->locator->set_custom_template($template_path, $fallback_template_path); - $this->cachepath = $this->phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_'; + $this->cachepath = $this->phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $style_name) . '_'; $this->context = new phpbb_template_context(); |