#305 Specified the charset in any call to htmlentities()

SVN:trunk[1110]
This commit is contained in:
Romain Quetiez
2011-03-07 16:43:20 +00:00
parent e36646a3e6
commit 019888caff
12 changed files with 42 additions and 42 deletions

View File

@@ -443,9 +443,9 @@ class Str
public static function pure2html($pure, $maxLength = false)
{
// Check for HTML entities, but be careful the DB is in UTF-8
return $maxLength
? htmlentities(substr($pure, 0, $maxLength), ENT_COMPAT, 'UTF-8')
: htmlentities($pure, ENT_COMPAT, 'UTF-8');
return $maxLength
? htmlentities(substr($pure, 0, $maxLength), ENT_QUOTES, 'UTF-8')
: htmlentities($pure, ENT_QUOTES, 'UTF-8');
}
public static function pure2sql($pure, $maxLength = false)
{