diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:16:53 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:21:08 +0200 |
| commit | 83bdf3eeb31d202f6806cacda66d039ae7c74dc2 (patch) | |
| tree | adc05fae806268bf387e8fb9dcdd40d1de3b4401 /phpBB/includes/template | |
| parent | 65bafb22810038fd51e22fd8168775afd86c2e74 (diff) | |
| parent | cc0aa90c49f99288cbda33519178a8042f1e4a71 (diff) | |
| download | forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.gz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.bz2 forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.xz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.zip | |
Merge branch 'develop' into ticket/11015
* develop:
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
[ticket/11002] Use translating option to rename the Etc/GMT options
Conflicts:
phpBB/includes/extension/manager.php
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/template.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 8ab3c44be3..13fa845659 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -54,7 +54,7 @@ class phpbb_template * PHP file extension * @var string */ - private $phpEx; + private $php_ext; /** * phpBB config instance @@ -87,10 +87,10 @@ class phpbb_template * @param user $user current user * @param phpbb_template_locator $locator template locator */ - public function __construct($phpbb_root_path, $phpEx, $config, $user, phpbb_template_locator $locator) + public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator) { $this->phpbb_root_path = $phpbb_root_path; - $this->phpEx = $phpEx; + $this->php_ext = $php_ext; $this->config = $config; $this->user = $user; $this->locator = $locator; @@ -313,7 +313,7 @@ class phpbb_template private function _compiled_file_for_handle($handle) { $source_file = $this->locator->get_filename_for_handle($handle); - $compiled_file = $this->cachepath . str_replace('/', '.', $source_file) . '.' . $this->phpEx; + $compiled_file = $this->cachepath . str_replace('/', '.', $source_file) . '.' . $this->php_ext; return $compiled_file; } |