diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:41:12 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:41:12 +0100 |
| commit | a469e804930e66c244da27deb4dc94b5e280659f (patch) | |
| tree | 3bab2abf053b81af81aab73d97c39d7f622f5130 /phpBB/includes/acp | |
| parent | 7a2348bf7f0ee67856cc5ae15591b7d1b7c48763 (diff) | |
| parent | 95cf47c4ef41b1ad7c5dc27eb9a078769851acf8 (diff) | |
| download | forums-a469e804930e66c244da27deb4dc94b5e280659f.tar forums-a469e804930e66c244da27deb4dc94b5e280659f.tar.gz forums-a469e804930e66c244da27deb4dc94b5e280659f.tar.bz2 forums-a469e804930e66c244da27deb4dc94b5e280659f.tar.xz forums-a469e804930e66c244da27deb4dc94b5e280659f.zip | |
Merge branch 'ticket/rxu/9933' into develop-olympus
* ticket/rxu/9933:
[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
Diffstat (limited to 'phpBB/includes/acp')
| -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 1cb9545967..88c5bbe592 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 |