diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-02 12:38:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-02 12:38:49 +0200 |
| commit | a35ad4e689c204c52d23c07b701433325c27b0dc (patch) | |
| tree | 6f0fa5edece4e049bb9d70860467e19cffeba45b /phpBB/includes/extension/controller.php | |
| parent | fa06b779ad7c80d76274ee080db494e9d767ae26 (diff) | |
| download | forums-a35ad4e689c204c52d23c07b701433325c27b0dc.tar forums-a35ad4e689c204c52d23c07b701433325c27b0dc.tar.gz forums-a35ad4e689c204c52d23c07b701433325c27b0dc.tar.bz2 forums-a35ad4e689c204c52d23c07b701433325c27b0dc.tar.xz forums-a35ad4e689c204c52d23c07b701433325c27b0dc.zip | |
[ticket/11041] Correctly import PHP file extension from global space.
85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of
"global $phpEx".
PHPBB3-11041
Diffstat (limited to 'phpBB/includes/extension/controller.php')
| -rw-r--r-- | phpBB/includes/extension/controller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/extension/controller.php b/phpBB/includes/extension/controller.php index ec051c756f..2b8c50aafb 100644 --- a/phpBB/includes/extension/controller.php +++ b/phpBB/includes/extension/controller.php @@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_ public function __construct() { global $request, $db, $user, $template, $config; - global $php_ext, $phpbb_root_path; + global $phpEx, $phpbb_root_path; $this->request = $request; $this->db = $db; $this->user = $user; $this->template = $template; $this->config = $config; - $this->php_ext = $php_ext; + $this->php_ext = $phpEx; $this->phpbb_root_path = $phpbb_root_path; } } |