mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 21:38:54 +00:00
[ticket/11768] Renamed get_words() to get_censored_words()
PHPBB3-11768
This commit is contained in:
parent
baadc2a6e5
commit
b12043d4b0
3 changed files with 4 additions and 4 deletions
|
@ -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);
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue