using more UTF-8, optimized the initial froxlor.sql statements, refs #1117
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
* @author Florian Lippert <flo@syscp.org>
|
||||
*/
|
||||
|
||||
function html_entity_decode_array($subject, $fields = '', $complete = false, $quote_style = ENT_COMPAT, $charset = 'ISO-8859-1')
|
||||
function html_entity_decode_array($subject, $fields = '', $complete = false, $quote_style = ENT_COMPAT, $charset = 'UTF-8')
|
||||
{
|
||||
if(is_array($subject))
|
||||
{
|
||||
|
||||
@@ -27,9 +27,21 @@
|
||||
|
||||
function html_entity_decode_complete($string)
|
||||
{
|
||||
while($string != html_entity_decode($string))
|
||||
global $theme;
|
||||
|
||||
if($theme == 'Classic')
|
||||
{
|
||||
$string = html_entity_decode($string);
|
||||
while($string != html_entity_decode($string))
|
||||
{
|
||||
$string = html_entity_decode($string);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
while($string != html_entity_decode($string, ENT_COMPAT | ENT_HTML5, 'UTF-8'))
|
||||
{
|
||||
$string = html_entity_decode($string, ENT_COMPAT | ENT_HTML5, 'UTF-8');
|
||||
}
|
||||
}
|
||||
|
||||
return $string;
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
* @author Florian Lippert <flo@syscp.org>
|
||||
*/
|
||||
|
||||
function htmlentities_array($subject, $fields = '', $quote_style = ENT_QUOTES, $charset = 'ISO-8859-1')
|
||||
function htmlentities_array($subject, $fields = '', $quote_style = ENT_QUOTES, $charset = 'UTF-8')
|
||||
{
|
||||
if(is_array($subject))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user