diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 16:48:19 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-15 16:48:19 +0200 |
| commit | bd81003759b8185128fa46e77263a28bf9ebb196 (patch) | |
| tree | a8aacc8f703701bbee7aa19f33a35ebae759c728 /phpBB/includes/message_parser.php | |
| parent | c39eef90e7e5f5e8a70d717c286d8846540d6c12 (diff) | |
| parent | a496015b985105dff1daed26ad172a3601fbbbd9 (diff) | |
| download | forums-bd81003759b8185128fa46e77263a28bf9ebb196.tar forums-bd81003759b8185128fa46e77263a28bf9ebb196.tar.gz forums-bd81003759b8185128fa46e77263a28bf9ebb196.tar.bz2 forums-bd81003759b8185128fa46e77263a28bf9ebb196.tar.xz forums-bd81003759b8185128fa46e77263a28bf9ebb196.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12433] Use a different message when nesting of quotes is not allowed
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 901bafbb2e..8bf50b0ca3 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -776,8 +776,16 @@ class bbcode_firstpass extends bbcode // the buffer holds a valid opening tag if ($config['max_quote_depth'] && sizeof($close_tags) >= $config['max_quote_depth']) { - // there are too many nested quotes - $error_ary['quote_depth'] = $user->lang('QUOTE_DEPTH_EXCEEDED', (int) $config['max_quote_depth']); + if ($config['max_quote_depth'] == 1) + { + // Depth 1 - no nesting is allowed + $error_ary['quote_depth'] = $user->lang('QUOTE_NO_NESTING'); + } + else + { + // There are too many nested quotes + $error_ary['quote_depth'] = $user->lang('QUOTE_DEPTH_EXCEEDED', (int) $config['max_quote_depth']); + } $out .= $buffer . $tok; $tok = '[]'; |