diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:58:10 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:58:10 +0100 |
| commit | 1c95101284d1545443bf6070d2f9dbc2880165f6 (patch) | |
| tree | fe969e58749941a6754ecc882223a7c3b921e026 /phpBB/includes/acp/acp_words.php | |
| parent | 08f6a12325ab02696e0093ff7ddfb005dd7d2321 (diff) | |
| parent | a469e804930e66c244da27deb4dc94b5e280659f (diff) | |
| download | forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.gz forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.bz2 forums-1c95101284d1545443bf6070d2f9dbc2880165f6.tar.xz forums-1c95101284d1545443bf6070d2f9dbc2880165f6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9933] Create unit test for word censor regular expression.
[ticket/9933] Move word censor regex into separate function in functions.php
[ticket/9933] Wrong handling consecutive multiple asterisks in word censor
Conflicts:
phpBB/includes/cache.php
Diffstat (limited to 'phpBB/includes/acp/acp_words.php')
| -rw-r--r-- | phpBB/includes/acp/acp_words.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php index 35095d8b71..450a2fad4c 100644 --- a/phpBB/includes/acp/acp_words.php +++ b/phpBB/includes/acp/acp_words.php @@ -95,6 +95,9 @@ class acp_words trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); } + // Replace multiple consecutive asterisks with single one as those are not needed + $word = preg_replace('#\*{2,}#', '*', $word); + $sql_ary = array( 'word' => $word, 'replacement' => $replacement |