diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:26:24 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-08-21 14:26:24 +0200 |
| commit | 91b415dd01095a4a108909b79f35f2146bb9abe7 (patch) | |
| tree | 401a422a14cbdcda4682adafa110dd35d68fc916 /phpBB | |
| parent | 9f9e4ad3d8d9b88be01427739088020d9e64164b (diff) | |
| parent | 459207636699ce5c554af115a7677f42630a430e (diff) | |
| download | forums-91b415dd01095a4a108909b79f35f2146bb9abe7.tar forums-91b415dd01095a4a108909b79f35f2146bb9abe7.tar.gz forums-91b415dd01095a4a108909b79f35f2146bb9abe7.tar.bz2 forums-91b415dd01095a4a108909b79f35f2146bb9abe7.tar.xz forums-91b415dd01095a4a108909b79f35f2146bb9abe7.zip | |
Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
* callumacrae/ticket/10240:
[ticket/10240] Reverted a commit which added buggy code.
Diffstat (limited to 'phpBB')
| -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 b34976db2a..b7650ecd6a 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)) { |