Fixed the error message for too many quotes

git-svn-id: file:///svn/phpbb/trunk@4225 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-07-12 16:04:24 +00:00
parent 448f31331b
commit 7ca4282622

View file

@ -277,7 +277,7 @@ class parse_message
$str_to = array('<', '>'); $str_to = array('<', '>');
$code = str_replace($str_from, $str_to, $code); $code = str_replace($str_from, $str_to, $code);
if (!preg_match('/\<\?.*?\?\>/is', $code)) if (!preg_match('/^\<\?.*?\?\>/is', $code))
{ {
$remove_tags = TRUE; $remove_tags = TRUE;
$code = "<?php $code ?>"; $code = "<?php $code ?>";
@ -310,7 +310,7 @@ class parse_message
$code = str_replace($str_from, $str_to, $code); $code = str_replace($str_from, $str_to, $code);
$code = preg_replace('#^(<span class="[a-z_]+">)\n?(.*?)\n?(</span>)$#is', '\1\2\3', $code); $code = preg_replace('#^(<span class="[a-z_]+">)\n?(.*?)\n?(</span>)$#is', '\1\2\3', $code);
$out .= "[code=$stx:" . $this->bbcode_uid . ']' . $code . '[/code:' . $this->bbcode_uid . ']'; $out .= "[code=$stx:" . $this->bbcode_uid . ']' . trim($code) . '[/code:' . $this->bbcode_uid . ']';
break; break;
default: default:
@ -489,7 +489,7 @@ class parse_message
if ($config['max_quote_depth'] && count($close_tags) >= $config['max_quote_depth']) if ($config['max_quote_depth'] && count($close_tags) >= $config['max_quote_depth'])
{ {
// there are too many nested quotes // there are too many nested quotes
$error_ary['quote_depth'] = $user->lang['QUOTE_DEPTH_EXCEEDED']; $error_ary['quote_depth'] = sprintf($user->lang['QUOTE_DEPTH_EXCEEDED'], $config['max_quote_depth']);
$out .= $buffer . $tok; $out .= $buffer . $tok;
$tok = '[]'; $tok = '[]';