makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11768] Renamed get_words() to get_censored_words()

Browse source 
PHPBB3-11768
This commit is contained in:
JoshyPHP 2015-03-03 00:43:46 +01:00
parent baadc2a6e5
commit b12043d4b0
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/textformatter/data_access.php
View file

@ -217,7 +217,7 @@ class data_access
* *
* @return array * @return array
*/ */
public function get_words() public function get_censored_words()
{ {
$sql = 'SELECT word, replacement FROM ' . $this->words_table; $sql = 'SELECT word, replacement FROM ' . $this->words_table;
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);

2
phpBB/phpbb/textformatter/s9e/factory.php
View file

@ -266,7 +266,7 @@ class factory implements \phpbb\textformatter\cache
} }
// Load the censored words // Load the censored words
$censor = $this->dal->get_words(); $censor = $this->dal->get_censored_words();
if (!empty($censor)) if (!empty($censor))
{ {
// Use a namespaced tag to avoid collisions // Use a namespaced tag to avoid collisions

4
tests/test_framework/phpbb_test_case_helpers.php
View file

@ -394,7 +394,7 @@ class phpbb_test_case_helpers
// Mock the DAL, make it return data from the fixture // Mock the DAL, make it return data from the fixture
$mb = $this->test_case->getMockBuilder('phpbb\\textformatter\\data_access'); $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( $mb->setConstructorArgs(array(
$this->test_case->getMock('phpbb\\db\\driver\\driver'), $this->test_case->getMock('phpbb\\db\\driver\\driver'),
'phpbb_bbcodes', 'phpbb_bbcodes',
@ -417,7 +417,7 @@ class phpbb_test_case_helpers
->method('get_styles') ->method('get_styles')
->will($this->test_case->returnValue($tables['phpbb_styles'])); ->will($this->test_case->returnValue($tables['phpbb_styles']));
$dal->expects($this->test_case->any()) $dal->expects($this->test_case->any())
->method('get_words') ->method('get_censored_words')
->will($this->test_case->returnValue($tables['phpbb_words'])); ->will($this->test_case->returnValue($tables['phpbb_words']));
// Cache the parser and renderer with a key based on this method's arguments // Cache the parser and renderer with a key based on this method's arguments