Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus

* callumacrae/ticket/10240:
  [ticket/10240] Reverted a commit which added buggy code.
This commit is contained in:
Andreas Fischer 2011-08-21 14:26:24 +02:00
commit 91b415dd01

View file

@ -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))
{ {