mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 03:55:23 +02:00
Code Issues Releases Wiki Activity

[ticket/11041] Correctly import PHP file extension from global space.

Browse Source 
85bcdbad468cd255a02d6c48b2dcd1d128978eed shouldn't have changed imports of
"global $phpEx".

PHPBB3-11041
This commit is contained in:
Andreas Fischer 2012-08-02 12:38:49 +02:00
parent fa06b779ad
commit a35ad4e689
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/acp_styles.php
View File

@ -40,7 +40,7 @@ class acp_styles
public function main($id, $mode) public function main($id, $mode)
{ {
global $db, $user, $phpbb_admin_path, $phpbb_root_path, $php_ext, $template, $request, $cache, $auth, $config; global $db, $user, $phpbb_admin_path, $phpbb_root_path, $phpEx, $template, $request, $cache, $auth, $config;
$this->db = $db; $this->db = $db;
$this->user = $user; $this->user = $user;
@ -50,12 +50,12 @@ class acp_styles
$this->auth = $auth; $this->auth = $auth;
$this->config = $config; $this->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $phpEx;
$this->default_style = $config['default_style']; $this->default_style = $config['default_style'];
$this->styles_path = $this->phpbb_root_path . $this->styles_path_absolute . '/'; $this->styles_path = $this->phpbb_root_path . $this->styles_path_absolute . '/';
$this->u_base_action = append_sid("{$phpbb_admin_path}index.$php_ext", "i={$id}"); $this->u_base_action = append_sid("{$phpbb_admin_path}index.{$this->php_ext}", "i={$id}");
$this->s_hidden_fields = array( $this->s_hidden_fields = array(
'mode' => $mode, 'mode' => $mode,
); );

4
phpBB/includes/extension/controller.php
View File

@ -64,14 +64,14 @@ abstract class phpbb_extension_controller implements phpbb_extension_controller_
public function __construct() public function __construct()
{ {
global $request, $db, $user, $template, $config; global $request, $db, $user, $template, $config;
global $php_ext, $phpbb_root_path; global $phpEx, $phpbb_root_path;
$this->request = $request; $this->request = $request;
$this->db = $db; $this->db = $db;
$this->user = $user; $this->user = $user;
$this->template = $template; $this->template = $template;
$this->config = $config; $this->config = $config;
$this->php_ext = $php_ext; $this->php_ext = $phpEx;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
} }
} }