[formats] Use custom characterset in all formats

The specified characterset will now apply to all formats
thus allowing other charactersets than 'UTF-8'
This commit is contained in:
logmanoriginal 2016-11-07 20:49:44 +01:00
parent 4f4fb11789
commit 3a2cb9ea1e
5 changed files with 35 additions and 17 deletions

View file

@ -42,12 +42,14 @@ class HtmlFormat extends FormatAbstract {
EOD;
}
$charset = $this->getCharset();
/* Data are prepared, now let's begin the "MAGIE !!!" */
$toReturn = <<<EOD
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta charset="{$charset}">
<title>{$title}</title>
<link href="css/HtmlFormat.css" rel="stylesheet">
<meta name="robots" content="noindex, follow">
@ -64,6 +66,9 @@ EOD;
</html>
EOD;
// Remove invalid characters
ini_set('mbstring.substitute_character', 'none');
$toReturn = mb_convert_encoding($toReturn, $this->getCharset(), 'UTF-8');
return $toReturn;
}