aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/phpbb/notification/type/quote.php2
-rw-r--r--phpBB/phpbb/textformatter/s9e/utils.php4
-rw-r--r--phpBB/phpbb/textformatter/utils_interface.php4
-rw-r--r--tests/text_formatter/s9e/utils_test.php8
4 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/phpbb/notification/type/quote.php b/phpBB/phpbb/notification/type/quote.php
index 1b8efe4c8e..51edfec6f7 100644
--- a/phpBB/phpbb/notification/type/quote.php
+++ b/phpBB/phpbb/notification/type/quote.php
@@ -75,7 +75,7 @@ class quote extends \phpbb\notification\type\post
'ignore_users' => array(),
), $options);
- $usernames = $this->utils->get_quote_authors($post['post_text']);
+ $usernames = $this->utils->get_outermost_quote_authors($post['post_text']);
if (empty($usernames))
{
diff --git a/phpBB/phpbb/textformatter/s9e/utils.php b/phpBB/phpbb/textformatter/s9e/utils.php
index 576ab9481c..e21dedecc4 100644
--- a/phpBB/phpbb/textformatter/s9e/utils.php
+++ b/phpBB/phpbb/textformatter/s9e/utils.php
@@ -35,12 +35,12 @@ class utils implements \phpbb\textformatter\utils_interface
}
/**
- * Get a list of quote authors, limited to the first level of quotes
+ * Get a list of quote authors, limited to the outermost quotes
*
* @param string $xml Parsed text
* @return string[] List of authors
*/
- public function get_quote_authors($xml)
+ public function get_outermost_quote_authors($xml)
{
$authors = array();
if (strpos($xml, '<QUOTE ') === false)
diff --git a/phpBB/phpbb/textformatter/utils_interface.php b/phpBB/phpbb/textformatter/utils_interface.php
index 183c426161..6d3fd13021 100644
--- a/phpBB/phpbb/textformatter/utils_interface.php
+++ b/phpBB/phpbb/textformatter/utils_interface.php
@@ -29,12 +29,12 @@ interface utils_interface
public function clean_formatting($text);
/**
- * Get a list of quote authors, limited to the first level of quotes
+ * Get a list of quote authors, limited to the outermost quotes
*
* @param string $text Parsed text
* @return string[] List of authors
*/
- public function get_quote_authors($text);
+ public function get_outermost_quote_authors($text);
/**
* Remove given BBCode and its content, at given nesting depth
diff --git a/tests/text_formatter/s9e/utils_test.php b/tests/text_formatter/s9e/utils_test.php
index 78e5869af1..b1b937709c 100644
--- a/tests/text_formatter/s9e/utils_test.php
+++ b/tests/text_formatter/s9e/utils_test.php
@@ -75,18 +75,18 @@ class phpbb_textformatter_s9e_utils_test extends phpbb_test_case
}
/**
- * @dataProvider get_quote_authors_tests
+ * @dataProvider get_outermost_quote_authors_tests
*/
- public function test_get_quote_authors($original, $expected)
+ public function test_get_outermost_quote_authors($original, $expected)
{
$container = $this->get_test_case_helpers()->set_s9e_services();
$utils = $container->get('text_formatter.utils');
$parser = $container->get('text_formatter.parser');
- $this->assertSame($expected, $utils->get_quote_authors($parser->parse($original)));
+ $this->assertSame($expected, $utils->get_outermost_quote_authors($parser->parse($original)));
}
- public function get_quote_authors_tests()
+ public function get_outermost_quote_authors_tests()
{
return array(
array(