diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-15 14:03:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-15 14:03:27 +0200 |
| commit | 34c1691d7e5ccf607ee72366aa0b7b19474c71e4 (patch) | |
| tree | 77a2e2bac3881f6a1fce970a4d952a8c02588711 /phpBB | |
| parent | bec9b7c34e63c7485477fa1edc2f6330889cc699 (diff) | |
| download | forums-34c1691d7e5ccf607ee72366aa0b7b19474c71e4.tar forums-34c1691d7e5ccf607ee72366aa0b7b19474c71e4.tar.gz forums-34c1691d7e5ccf607ee72366aa0b7b19474c71e4.tar.bz2 forums-34c1691d7e5ccf607ee72366aa0b7b19474c71e4.tar.xz forums-34c1691d7e5ccf607ee72366aa0b7b19474c71e4.zip | |
[ticket/12433] Use a different message when nesting of quotes is not allowed
PHPBB3-12433
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/message_parser.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
2 files changed, 11 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 = '[]'; diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 2b9b03101e..935a348ef4 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -221,6 +221,7 @@ $lang = array_merge($lang, array( 1 => 'You may embed only %d quote within each other.', 2 => 'You may embed only %d quotes within each other.', ), + 'QUOTE_NO_NESTING' => 'You may not embed quotes within each other.', 'SAVE' => 'Save', 'SAVE_DATE' => 'Saved at', |