From b12043d4b076b1e214fd85da28358ba829d47a76 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 3 Mar 2015 00:43:46 +0100
Subject: [PATCH] [ticket/11768] Renamed get_words() to get_censored_words()

PHPBB3-11768
---
 phpBB/phpbb/textformatter/data_access.php        | 2 +-
 phpBB/phpbb/textformatter/s9e/factory.php        | 2 +-
 tests/test_framework/phpbb_test_case_helpers.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpBB/phpbb/textformatter/data_access.php b/phpBB/phpbb/textformatter/data_access.php
index 2576b734f4..008e1fd5c0 100644
--- a/phpBB/phpbb/textformatter/data_access.php
+++ b/phpBB/phpbb/textformatter/data_access.php
@@ -217,7 +217,7 @@ class data_access
 	*
 	* @return array
 	*/
-	public function get_words()
+	public function get_censored_words()
 	{
 		$sql = 'SELECT word, replacement FROM ' . $this->words_table;
 		$result = $this->db->sql_query($sql);
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 20ed692850..ce9d34e247 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -266,7 +266,7 @@ class factory implements \phpbb\textformatter\cache
 		}
 
 		// Load the censored words
-		$censor = $this->dal->get_words();
+		$censor = $this->dal->get_censored_words();
 		if (!empty($censor))
 		{
 			// Use a namespaced tag to avoid collisions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 3423d83bb1..8e49dca40c 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -394,7 +394,7 @@ class phpbb_test_case_helpers
 
 		// Mock the DAL, make it return data from the fixture
 		$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access');
-		$mb->setMethods(array('get_bbcodes', 'get_smilies', 'get_styles', 'get_words'));
+		$mb->setMethods(array('get_bbcodes', 'get_censored_words', 'get_smilies', 'get_styles'));
 		$mb->setConstructorArgs(array(
 			$this->test_case->getMock('phpbb\\db\\driver\\driver'),
 			'phpbb_bbcodes',
@@ -417,7 +417,7 @@ class phpbb_test_case_helpers
 		    ->method('get_styles')
 		    ->will($this->test_case->returnValue($tables['phpbb_styles']));
 		$dal->expects($this->test_case->any())
-		    ->method('get_words')
+		    ->method('get_censored_words')
 		    ->will($this->test_case->returnValue($tables['phpbb_words']));
 
 		// Cache the parser and renderer with a key based on this method's arguments