aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2012-08-06 23:21:06 +0200
committerIgor Wiedler <igor@wiedler.ch>2012-08-06 23:21:06 +0200
commitae3f86dbb076c84dbae1588deca3244a102005fd (patch)
treef902a91e852a7a1ecee9d61871c1efa36344cecb
parent8ce0a4eebd260a861d2f0055e393528a21b0bf5c (diff)
parenta35ad4e689c204c52d23c07b701433325c27b0dc (diff)
downloadforums-ae3f86dbb076c84dbae1588deca3244a102005fd.tar
forums-ae3f86dbb076c84dbae1588deca3244a102005fd.tar.gz
forums-ae3f86dbb076c84dbae1588deca3244a102005fd.tar.bz2
forums-ae3f86dbb076c84dbae1588deca3244a102005fd.tar.xz
forums-ae3f86dbb076c84dbae1588deca3244a102005fd.zip
Merge remote-tracking branch 'bantu/ticket/11041' into develop
* bantu/ticket/11041: [ticket/11041] Correctly import PHP file extension from global space.
-rw-r--r--phpBB/includes/acp/acp_styles.php6
-rw-r--r--phpBB/includes/extension/controller.php4
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;
}
}