5 files changed, 66 insertions, 35 deletions
diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index 141f90c7ae..51edfec6f7 100644
--- a/phpBB/phpbb/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
@@ -21,6 +21,11 @@ namespace phpbb\notification\type;
 class quote extends \phpbb\notification\type\post
 {
 	/**
+	* @var \phpbb\textformatter\utils_interface
+	*/
+	protected $utils;
+
+	/**
 	* Get notification type name
 	*
 	* @return string
@@ -31,13 +36,6 @@ class quote extends \phpbb\notification\type\post
 	}
 
 	/**
-	* regular expression to match to find usernames
-	*
-	* @var string
-	*/
-	protected static $regular_expression_match = '#\[quote=&quot;(.+?)&quot;#';
-
-	/**
 	* Language key used to output the text
 	*
 	* @var string
@@ -77,17 +75,16 @@ class quote extends \phpbb\notification\type\post
 			'ignore_users'		=> array(),
 		), $options);
 
-		$usernames = false;
-		preg_match_all(self::$regular_expression_match, $post['post_text'], $usernames);
+		$usernames = $this->utils->get_outermost_quote_authors($post['post_text']);
 
-		if (empty($usernames[1]))
+		if (empty($usernames))
 		{
 			return array();
 		}
 
-		$usernames[1] = array_unique($usernames[1]);
+		$usernames = array_unique($usernames);
 
-		$usernames = array_map('utf8_clean_string', $usernames[1]);
+		$usernames = array_map('utf8_clean_string', $usernames);
 
 		$users = array();
 
@@ -187,4 +184,14 @@ class quote extends \phpbb\notification\type\post
 			'AUTHOR_NAME'		=> htmlspecialchars_decode($user_data['username']),
 		));
 	}
+
+	/**
+	* Set the utils service used to retrieve quote authors
+	*
+	* @param \phpbb\textformatter\utils_interface $utils
+	*/
+	public function set_utils(\phpbb\textformatter\utils_interface $utils)
+	{
+		$this->utils = $utils;
+	}
 }
diff --git a/phpBB/phpbb/textformatter/parser_interface.php b/phpBB/phpbb/textformatter/parser_interface.php
index 3cb9f8e977..ad611fb5b4 100644
--- a/phpBB/phpbb/textformatter/parser_interface.php
+++ b/phpBB/phpbb/textformatter/parser_interface.php
@@ -82,7 +82,8 @@ interface parser_interface
 	/**
 	* Get the list of errors that were generated during last parsing
 	*
-	* @return array
+	* @return array[] Array of arrays. Each array contains a lang string at index 0 plus any number
+	*                 of optional parameters
 	*/
 	public function get_errors();
 
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index e46a0578d2..b7d0b2b90b 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -32,20 +32,14 @@ class parser implements \phpbb\textformatter\parser_interface
 	protected $parser;
 
 	/**
-	* @var \phpbb\user User object, used for translating errors
-	*/
-	protected $user;
-
-	/**
 	* Constructor
 	*
 	* @param \phpbb\cache\driver_interface $cache
 	* @param string $key Cache key
-	* @param \phpbb\user $user
 	* @param factory $factory
 	* @param \phpbb\event\dispatcher_interface $dispatcher
 	*/
-	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, \phpbb\user $user, factory $factory, \phpbb\event\dispatcher_interface $dispatcher)
+	public function __construct(\phpbb\cache\driver\driver_interface $cache, $key, factory $factory, \phpbb\event\dispatcher_interface $dispatcher)
 	{
 		$parser = $cache->get($key);
 		if (!$parser)
@@ -56,24 +50,21 @@ class parser implements \phpbb\textformatter\parser_interface
 
 		$this->dispatcher = $dispatcher;
 		$this->parser = $parser;
-		$this->user = $user;
 		$parser = $this;
 
 		/**
 		* Configure the parser service
 		*
 		* Can be used to:
-		*  - toggle features according to the user's preferences,
-		*  - toggle BBCodes according to the user's permissions,
-		*  - register variables or custom parsers in the s9e\TextFormatter
-		*  - configure the s9e\TextFormatter parser
+		*  - toggle features or BBCodes
+		*  - register variables or custom parsers in the s9e\TextFormatter parser
+		*  - configure the s9e\TextFormatter parser's runtime settings
 		*
 		* @event core.text_formatter_s9e_parser_setup
 		* @var \phpbb\textformatter\s9e\parser parser This parser service
-		* @var \phpbb\user user Current user
 		* @since 3.2.0-a1
 		*/
-		$vars = array('parser', 'user');
+		$vars = array('parser');
 		extract($dispatcher->trigger_event('core.text_formatter_s9e_parser_setup', compact($vars)));
 	}
 
@@ -196,13 +187,12 @@ class parser implements \phpbb\textformatter\parser_interface
 	/**
 	* {@inheritdoc}
 	*
-	* This will translate the log entries found in s9e\TextFormatter's logger into phpBB error
+	* This will convert the log entries found in s9e\TextFormatter's logger into phpBB error
 	* messages
 	*/
 	public function get_errors()
 	{
 		$errors = array();
-
 		foreach ($this->parser->getLogger()->get() as $entry)
 		{
 			list($type, $msg, $context) = $entry;
@@ -211,29 +201,29 @@ class parser implements \phpbb\textformatter\parser_interface
 			{
 				if ($context['tagName'] === 'E')
 				{
-					$errors[] = $this->user->lang('TOO_MANY_SMILIES', $context['tagLimit']);
+					$errors[] = array('TOO_MANY_SMILIES', $context['tagLimit']);
 				}
 				else if ($context['tagName'] === 'URL')
 				{
-					$errors[] = $this->user->lang('TOO_MANY_URLS', $context['tagLimit']);
+					$errors[] = array('TOO_MANY_URLS', $context['tagLimit']);
 				}
 			}
 			else if ($msg === 'MAX_FONT_SIZE_EXCEEDED')
 			{
-				$errors[] = $this->user->lang($msg, $context['max_size']);
+				$errors[] = array($msg, $context['max_size']);
 			}
 			else if (preg_match('/^MAX_(?:FLASH|IMG)_(HEIGHT|WIDTH)_EXCEEDED$/D', $msg, $m))
 			{
-				$errors[] = $this->user->lang($msg, $context['max_' . strtolower($m[1])]);
+				$errors[] = array($msg, $context['max_' . strtolower($m[1])]);
 			}
 			else if ($msg === 'Tag is disabled')
 			{
 				$name = strtolower($context['tag']->getName());
-				$errors[] = $this->user->lang('UNAUTHORISED_BBCODE', '[' . $name . ']');
+				$errors[] = array('UNAUTHORISED_BBCODE', '[' . $name . ']');
 			}
 			else if ($msg === 'UNABLE_GET_IMAGE_SIZE')
 			{
-				$errors[] = $this->user->lang($msg);
+				$errors[] = array($msg);
 			}
 		}
 
diff --git a/phpBB/phpbb/textformatter/s9e/utils.php b/phpBB/phpbb/textformatter/s9e/utils.php
index 2018bbf519..e21dedecc4 100644
--- a/phpBB/phpbb/textformatter/s9e/utils.php
+++ b/phpBB/phpbb/textformatter/s9e/utils.php
@@ -35,6 +35,31 @@ class utils implements \phpbb\textformatter\utils_interface
 	}
 
 	/**
+	* Get a list of quote authors, limited to the outermost quotes
+	*
+	* @param  string   $xml Parsed text
+	* @return string[]      List of authors
+	*/
+	public function get_outermost_quote_authors($xml)
+	{
+		$authors = array();
+		if (strpos($xml, '<QUOTE ') === false)
+		{
+			return $authors;
+		}
+
+		$dom = new \DOMDocument;
+		$dom->loadXML($xml);
+		$xpath = new \DOMXPath($dom);
+		foreach ($xpath->query('//QUOTE[not(ancestor::QUOTE)]/@author') as $author)
+		{
+			$authors[] = $author->textContent;
+		}
+
+		return $authors;
+	}
+
+	/**
 	* Remove given BBCode and its content, at given nesting depth
 	*
 	* @param  string  $xml         Parsed text
diff --git a/phpBB/phpbb/textformatter/utils_interface.php b/phpBB/phpbb/textformatter/utils_interface.php
index 132dc8ece4..6d3fd13021 100644
--- a/phpBB/phpbb/textformatter/utils_interface.php
+++ b/phpBB/phpbb/textformatter/utils_interface.php
@@ -29,6 +29,14 @@ interface utils_interface
 	public function clean_formatting($text);
 
 	/**
+	* Get a list of quote authors, limited to the outermost quotes
+	*
+	* @param  string   $text Parsed text
+	* @return string[]       List of authors
+	*/
+	public function get_outermost_quote_authors($text);
+
+	/**
 	* Remove given BBCode and its content, at given nesting depth
 	*
 	* @param  string  $text        Parsed text