aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-03-03 00:43:46 +0100
committerJoshyPHP <s9e.dev@gmail.com>2015-04-02 19:16:02 +0200
commitb12043d4b076b1e214fd85da28358ba829d47a76 (patch)
tree2a97e132100c6df948b9b7b8ea21bb36d01e3f05 /phpBB/phpbb
parentbaadc2a6e52437d9d5912c828a337a3c2866c9eb (diff)
downloadforums-b12043d4b076b1e214fd85da28358ba829d47a76.tar
forums-b12043d4b076b1e214fd85da28358ba829d47a76.tar.gz
forums-b12043d4b076b1e214fd85da28358ba829d47a76.tar.bz2
forums-b12043d4b076b1e214fd85da28358ba829d47a76.tar.xz
forums-b12043d4b076b1e214fd85da28358ba829d47a76.zip
[ticket/11768] Renamed get_words() to get_censored_words()
PHPBB3-11768
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/textformatter/data_access.php2
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php2
2 files changed, 2 insertions, 2 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