mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-24 02:48:56 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10240] Reverted a commit which added buggy code.
This commit is contained in:
commit
0b9fe01cce
1 changed files with 0 additions and 3 deletions
|
@ -691,9 +691,6 @@ function censor_text($text)
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Strip control characters
|
|
||||||
$text = preg_replace('/[\x00-\x0f]/', '', $text);
|
|
||||||
|
|
||||||
// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
|
// We moved the word censor checks in here because we call this function quite often - and then only need to do the check once
|
||||||
if (!isset($censors) || !is_array($censors))
|
if (!isset($censors) || !is_array($censors))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue