diff --git a/inc-public-global.php3 b/inc-public-global.php3 index ef82799ab01c81f4498ea3d374a079865431aec5..d42eb289815aaf79ad2795ea973c9774b80828fe 100644 --- a/inc-public-global.php3 +++ b/inc-public-global.php3 @@ -334,12 +334,4 @@ function _request($var) { if (isset($_POST[$var])) return $_POST[$var]; return NULL; } - -function charger_analyseur_xhtml($nom) -{ - if ($nom === true) $nom = 'tidy'; - $file = 'inc_' . $nom. ".php"; - if (is_readable(_DIR_RESTREINT . $file)) { include_ecrire($file); } -} - ?> diff --git a/inc-public.php3 b/inc-public.php3 index 0981eb3f993c73bd8514e729d80625adc3cff5d8..4cc56f955a42df58f2affaef1926e55609cd74b3 100644 --- a/inc-public.php3 +++ b/inc-public.php3 @@ -95,11 +95,8 @@ if (defined("_INC_PUBLIC")) { // Valider/indenter a la demande. garder la compatibilite tidy if (trim($page) AND $xhtml AND !$flag_preserver AND !headers_sent()) { - charger_analyseur_xhtml($xhtml); - if (function_exists($xhtml)) - $page = $xhtml($page); - else if (function_exists('xhtml')) - $page = xhtml($page); + $f = include_fonction(($xhtml === true) ? 'tidy' : $xhtml); + $page = $f($page); } // Inserer au besoin les boutons admins