diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:16:53 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-21 18:21:08 +0200 |
| commit | 83bdf3eeb31d202f6806cacda66d039ae7c74dc2 (patch) | |
| tree | adc05fae806268bf387e8fb9dcdd40d1de3b4401 /phpBB/includes/acp | |
| parent | 65bafb22810038fd51e22fd8168775afd86c2e74 (diff) | |
| parent | cc0aa90c49f99288cbda33519178a8042f1e4a71 (diff) | |
| download | forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.gz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.bz2 forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.tar.xz forums-83bdf3eeb31d202f6806cacda66d039ae7c74dc2.zip | |
Merge branch 'develop' into ticket/11015
* develop:
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
[ticket/11002] Use translating option to rename the Etc/GMT options
Conflicts:
phpBB/includes/extension/manager.php
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'] ); } |