From 34c1691d7e5ccf607ee72366aa0b7b19474c71e4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 15 May 2014 14:03:27 +0200
Subject: [ticket/12433] Use a different message when nesting of quotes is not
 allowed

PHPBB3-12433
---
 phpBB/includes/message_parser.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes')

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 = '[]';
-- 
cgit v1.2.1