diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-07 11:40:38 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-07 11:40:38 -0400 |
| commit | 770788d98eb9dfca51e6299e023edab26765c0bf (patch) | |
| tree | 17817163962b9c8aaea7dfdbc3cc2ed3cdd7b774 /lib/util.php | |
| parent | 4cc6d0ea2c7bec551c7726d7a336afea17d27df8 (diff) | |
| parent | 17fb51f747c023392cd6127abe9b019e693f0544 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/util.php b/lib/util.php index 73410e289..b17a44bd8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -581,10 +581,8 @@ function common_shorten_link($url, $reverse = false) function common_xml_safe_str($str) { - $xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8'); - - // Replace control, formatting, and surrogate characters with '*', ala Twitter - return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str); + // Neutralize control codes and surrogates + return preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str); } function common_tag_link($tag) |