diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-07-12 16:04:24 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-07-12 16:04:24 +0000 |
| commit | 7ca428262214dcdba85651131d1a587cff8d1912 (patch) | |
| tree | 011e9dbee88e8fb174e37f5704f591076bb487aa /phpBB/includes/message_parser.php | |
| parent | 448f31331ba6ec5813bf5fa11ec8464f364b1971 (diff) | |
| download | forums-7ca428262214dcdba85651131d1a587cff8d1912.tar forums-7ca428262214dcdba85651131d1a587cff8d1912.tar.gz forums-7ca428262214dcdba85651131d1a587cff8d1912.tar.bz2 forums-7ca428262214dcdba85651131d1a587cff8d1912.tar.xz forums-7ca428262214dcdba85651131d1a587cff8d1912.zip | |
Fixed the error message for too many quotes
git-svn-id: file:///svn/phpbb/trunk@4225 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index bea859b6f6..665e9bb982 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -277,7 +277,7 @@ class parse_message $str_to = array('<', '>'); $code = str_replace($str_from, $str_to, $code); - if (!preg_match('/\<\?.*?\?\>/is', $code)) + if (!preg_match('/^\<\?.*?\?\>/is', $code)) { $remove_tags = TRUE; $code = "<?php $code ?>"; @@ -310,7 +310,7 @@ class parse_message $code = str_replace($str_from, $str_to, $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; default: @@ -489,7 +489,7 @@ class parse_message if ($config['max_quote_depth'] && count($close_tags) >= $config['max_quote_depth']) { // 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; $tok = '[]'; |