makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12433] Use a different message when nesting of quotes is not allowed
This commit is contained in:
Andreas Fischer 2014-05-15 16:48:19 +02:00
commit bd81003759
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/message_parser.php
View file

@ -776,8 +776,16 @@ class bbcode_firstpass extends bbcode
// the buffer holds a valid opening tag // the buffer holds a valid opening tag
if ($config['max_quote_depth'] && sizeof($close_tags) >= $config['max_quote_depth']) if ($config['max_quote_depth'] && sizeof($close_tags) >= $config['max_quote_depth'])
{ {
// there are too many nested quotes if ($config['max_quote_depth'] == 1)
$error_ary['quote_depth'] = $user->lang('QUOTE_DEPTH_EXCEEDED', (int) $config['max_quote_depth']); {
// 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; $out .= $buffer . $tok;
$tok = '[]'; $tok = '[]';

1
phpBB/language/en/posting.php
View file

@ -221,6 +221,7 @@ $lang = array_merge($lang, array(
1 => 'You may embed only %d quote within each other.', 1 => 'You may embed only %d quote within each other.',
2 => 'You may embed only %d quotes 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' => 'Save',
'SAVE_DATE' => 'Saved at', 'SAVE_DATE' => 'Saved at',