From a35ad4e689c204c52d23c07b701433325c27b0dc Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Thu, 2 Aug 2012 12:38:49 +0200
Subject: [PATCH] [ticket/11041] Correctly import PHP file extension from
 global space.

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

PHPBB3-11041
---
 phpBB/includes/acp/acp_styles.php       | 6 +++---
 phpBB/includes/extension/controller.php | 4 ++--
 2 files changed, 5 insertions(+), 5 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,
 		);
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;
 	}
 }