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/acp/acp_styles.php | |
| parent | Merge remote-tracking branch 'nickvergessen/ticket/11004' into develop (diff) | |
| download | phpbb-a35ad4e689c204c52d23c07b701433325c27b0dc.tar.gz phpbb-a35ad4e689c204c52d23c07b701433325c27b0dc.tar.bz2 phpbb-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/acp/acp_styles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index d41ef571dd..db77825ae7 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -40,7 +40,7 @@ class acp_styles 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->user = $user; @@ -50,12 +50,12 @@ class acp_styles $this->auth = $auth; $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; - $this->php_ext = $php_ext; + $this->php_ext = $phpEx; $this->default_style = $config['default_style']; $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( 'mode' => $mode, ); |