From 5441c1c531597af3bada29cfd8fc35e71ddce75c Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sat, 27 Oct 2007 18:36:02 +0000
Subject: [PATCH] =?UTF-8?q?Sous=20le=20d=C3=A9busqueur,=20toujours=20propo?=
=?UTF-8?q?ser=20la=20validation=20XML,=20l'existence=20du=20service=20ne?=
=?UTF-8?q?=20se=20devine=20pas.=20Nouvelle=20spec=20du=20coup:=20si=20la?=
=?UTF-8?q?=20variable=20{{{xhtml}}}=20vaut=20{{{true}}},=20on=20propose?=
=?UTF-8?q?=20=20le=20validateur=20du=20W3C,=20sinon=20on=20propose=20le?=
=?UTF-8?q?=20validateur=20maison.=20Pour=20la=20simple=20indentation,=20h?=
=?UTF-8?q?ors=20d=C3=A9busqueur,=20si=20elle=20vaut=20{{{true}}}=20et=20q?=
=?UTF-8?q?u'il=20existe=20{{{inc=5Ftidy}}}=C2=A0on=20appelle=20cette=20fo?=
=?UTF-8?q?nction,=20sinon=20on=20appelle=20l'indenteur=20maison.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/balise/formulaire_admin.php | 5 ++---
ecrire/public/assembler.php | 7 +++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ecrire/balise/formulaire_admin.php b/ecrire/balise/formulaire_admin.php
index 18781db165..0f1c26030a 100644
--- a/ecrire/balise/formulaire_admin.php
+++ b/ecrire/balise/formulaire_admin.php
@@ -105,12 +105,11 @@ function balise_FORMULAIRE_ADMIN_dyn($float='', $debug='') {
!$var_preview
)
) ? parametre_url(self(),'var_mode', 'debug', '&'): '';
- $analyser = !$xhtml ? "" :
- (($xhtml === 'sax') ?
+ $analyser = (@$xhtml !== 'true') ?
(parametre_url(self(), 'var_mode', 'debug', '&')
.'&var_mode_affiche=validation') :
('http://validator.w3.org/check?uri='
- . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri())));
+ . rawurlencode("http://" . $_SERVER['HTTP_HOST'] . nettoyer_uri()));
// hack - ne pas avoir la rubrique si un autre bouton est deja present
if ($id_article OR $id_breve) unset ($id_rubrique);
diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php
index 728be8cd33..3a616ffcab 100644
--- a/ecrire/public/assembler.php
+++ b/ecrire/public/assembler.php
@@ -353,8 +353,11 @@ function f_tidy ($texte) {
# Compatibilite ascendante
if (!is_string($xhtml)) $xhtml ='tidy';
- if ($f = charger_fonction($xhtml, 'inc'))
- $texte = $f($texte);
+ if (!$f = charger_fonction($xhtml, 'inc', true)) {
+ spip_log("tidy absent, l'indenteur SPIP le remplace");
+ $f = charger_fonction('sax', 'inc');
+ }
+ return $f($texte);
}
return $texte;
--
GitLab