fix: balise `<meta charset="#CHARSET">` réduite et valide HTML5

Ref: #5667

fix: balise `<meta charset="#CHARSET">` réduite et valide HTML5
373bc303 · b_b · 8524d49e · 373bc303 · 373bc303 · 373bc303
--- a/ecrire/inc/headers.php
+++ b/ecrire/inc/headers.php
@@ -104,7 +104,7 @@ function redirige_par_entete($url, $equiv = '', $status = 302) {
 <head>',
 	$equiv, '
 <title>HTTP ' . $status . '</title>
-' . ((isset($GLOBALS['meta']['charset'])) ? '<meta http-equiv="Content-Type" content="text/html;charset=' . $GLOBALS['meta']['charset'] . '">' : '') . '
+' . ((isset($GLOBALS['meta']['charset'])) ? '<meta charset="' . $GLOBALS['meta']['charset'] . '">' : '') . '
 </head>
 <body>
 <h1>HTTP ' . $status . '</h1>

--- a/ecrire/public/balises.php
+++ b/ecrire/public/balises.php
@@ -129,7 +129,7 @@ function balise_DESCRIPTIF_SITE_SPIP_dist($p) {
 * @link https://www.spip.net/4331
 * @example
 *     ```
- *     <meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
+ *     <meta charset="#CHARSET" />
 *     ```
 *
 * @param Champ $p

--- a/ecrire/public/debusquer.php
+++ b/ecrire/public/debusquer.php
@@ -858,9 +858,7 @@ function debusquer_entete($titre, $corps) {
 		_T('admin_debug') . ' ' . spip_htmlspecialchars($titre) . ' (' .
 		supprimer_tags(corriger_typo($GLOBALS['meta']['nom_site']))) .
 	")</title>\n" .
-	"<meta http-equiv='Content-Type' content='text/html" .
+	($c = $GLOBALS['meta']['charset']) ? "<meta charset='$c' />\n" : '' .
-	(($c = $GLOBALS['meta']['charset']) ? "; charset=$c" : '') .
-	"' />\n" .
 	http_script('', 'jquery.js')
 	. "<link rel='stylesheet' href='" . url_absolue(find_in_path('spip_admin.css'))
 	. "' type='text/css' />" .

--- a/prive/login.html
+++ b/prive/login.html
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <head>
 <title>[(#NOM_SITE_SPIP|textebrut)]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
+<meta charset="#CHARSET" />
 <meta name="robots" content="none" />
 <meta name="viewport" content="width=device-width" />
 #INSERT_HEAD_CSS

--- a/prive/spip_pass.html
+++ b/prive/spip_pass.html
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="#LANG" lang="#LANG" dir="#LANG_DIR">
 <head>
 <title><:pass_mot_oublie:> - [(#NOM_SITE_SPIP|textebrut)]</title>
-<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET" />
+<meta charset="#CHARSET" />
 <meta name="robots" content="none" />
 <meta name="viewport" content="width=device-width" />
 #INSERT_HEAD_CSS

--- a/prive/squelettes/inclure/head.html
+++ b/prive/squelettes/inclure/head.html
@@ -2,9 +2,8 @@
 Appel au script php en attendant de reecrire le head ici
 ]
 [<title>(#ENV{titre,''})</title>
-]
+][<meta charset=(#CONFIG{charset})" />
-<meta http-equiv="Content-Type" content="text/html[; charset=(#CONFIG{charset})]" />
+]<script>
-<script>
 var url_menu_rubrique="[(#VAL{menu_rubriques}|generer_url_action{[date=(#CONFIG{date_calcul_rubriques})],1})]";
 (function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement);
 [(#EVAL{$_COOKIE}|table_valeur{spip_accepte_ajax}|>={1}|non)