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/extension/controller.php | |
| 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/extension/controller.php')
| -rw-r--r-- | phpBB/includes/extension/controller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index c7fd439a19..ec051c756f 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -50,7 +50,7 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ /** * @var string PHP Extension */ - protected $phpEx; + protected $php_ext; /** * @var string Relative path to board root @@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ public function __construct() { global $request, $db, $user, $template, $config; - global $phpEx, $phpbb_root_path; + global $php_ext, $phpbb_root_path; $this->request = $request; $this->db = $db; $this->user = $user; $this->template = $template; $this->config = $config; - $this->phpEx = $phpEx; + $this->php_ext = $php_ext; $this->phpbb_root_path = $phpbb_root_path; } } |