diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:39:57 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-21 16:39:57 +0200 |
| commit | cc0aa90c49f99288cbda33519178a8042f1e4a71 (patch) | |
| tree | b6f4d8b001a8fabb78acf0cb48019547c2be3bff /phpBB/includes/acp | |
| parent | 61f05e027d7fa86b3656e5186645de6422a4dc76 (diff) | |
| parent | 87b278bda7504f2f7d0a19dfa6a8552fde50e5a6 (diff) | |
| download | forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.gz forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.bz2 forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.tar.xz forums-cc0aa90c49f99288cbda33519178a8042f1e4a71.zip | |
Merge remote-tracking branch 'github-igorw/ticket/11012' into develop
* github-igorw/ticket/11012:
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_styles.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 943bfe6a6f..d41ef571dd 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -36,11 +36,11 @@ class acp_styles protected $cache; protected $auth; protected $phpbb_root_path; - protected $phpEx; + protected $php_ext; public function main($id, $mode) { - global $db, $user, $phpbb_admin_path, $phpbb_root_path, $phpEx, $template, $request, $cache, $auth, $config; + global $db, $user, $phpbb_admin_path, $phpbb_root_path, $php_ext, $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->phpEx = $phpEx; + $this->php_ext = $php_ext; $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.$phpEx", "i={$id}"); + $this->u_base_action = append_sid("{$phpbb_admin_path}index.$php_ext", "i={$id}"); $this->s_hidden_fields = array( 'mode' => $mode, ); @@ -939,7 +939,7 @@ class acp_styles // Preview $actions[] = array( - 'U_ACTION' => append_sid($this->phpbb_root_path . 'index.' . $this->phpEx, 'style=' . $style['style_id']), + 'U_ACTION' => append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'style=' . $style['style_id']), 'L_ACTION' => $this->user->lang['PREVIEW'] ); } |