diff options
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_captcha.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index edc8a594da..675048327a 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -89,6 +89,7 @@ class acp_bbcodes 'U_BACK' => $this->u_action, 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''), + 'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '<a href="#down">', '</a>'), 'BBCODE_MATCH' => $bbcode_match, 'BBCODE_TPL' => $bbcode_tpl, 'DISPLAY_ON_POSTING' => $display_on_posting) @@ -278,8 +279,8 @@ class acp_bbcodes { $token_type = $m[1][$n]; - reset($tokens[$token_type]); - list($match, $replace) = each($tokens[$token_type]); + reset($tokens[strtoupper($token_type)]); + list($match, $replace) = each($tokens[strtoupper($token_type)]); // Pad backreference numbers from tokens if (preg_match_all('/(?<!\\\\)\$([0-9]+)/', $replace, $repad)) @@ -337,7 +338,7 @@ class acp_bbcodes } // Lowercase tags - $bbcode_tag = preg_replace('/.*?\[([a-z]+=?).*/i', '$1', $bbcode_match); + $bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match); $fp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_match); $fp_replace = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $fp_replace); $sp_match = preg_replace('#\[/?' . $bbcode_tag . '#ie', "strtolower('\$0')", $sp_match); diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index dc28eb1583..e20937102c 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -99,6 +99,8 @@ class acp_captcha trigger_error($user->lang['BAD_POLICY']); } + $user->add_lang('ucp'); + include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx); $captcha = new captcha(); diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index fbe4f78aca..5d023d6205 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -42,7 +42,7 @@ class acp_database $type = request_var('type', ''); $table = request_var('table', array('')); $format = request_var('method', ''); - $where = request_var('WHERE', ''); + $where = request_var('where', ''); $store = $download = $structure = $schema_data = false; |