diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:26:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:26:37 +0200 |
| commit | 0b9fe01cce56cd8421e8eb43cdadc63f1d244987 (patch) | |
| tree | 67e5ff3838757dc79ecb46be4bbeed2f6da02974 /phpBB/includes | |
| parent | 4253a73e81fd10b8018885e2268726e397a6369e (diff) | |
| parent | 91b415dd01095a4a108909b79f35f2146bb9abe7 (diff) | |
| download | forums-0b9fe01cce56cd8421e8eb43cdadc63f1d244987.tar forums-0b9fe01cce56cd8421e8eb43cdadc63f1d244987.tar.gz forums-0b9fe01cce56cd8421e8eb43cdadc63f1d244987.tar.bz2 forums-0b9fe01cce56cd8421e8eb43cdadc63f1d244987.tar.xz forums-0b9fe01cce56cd8421e8eb43cdadc63f1d244987.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10240] Reverted a commit which added buggy code.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_content.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 63e4a16fb6..b1294a2f14 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -691,9 +691,6 @@ function censor_text($text) 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 if (!isset($censors) || !is_array($censors)) { |