diff --git a/ecrire/public/normaliser.php b/ecrire/public/normaliser.php index a61e5fe412ebf7e21bb002b5f99dbe58fd887b2f..5f467728a19f7c9759135103e8edeee31bad4bf2 100644 --- a/ecrire/public/normaliser.php +++ b/ecrire/public/normaliser.php @@ -93,27 +93,6 @@ function phraser_vieux_recherche($p) { } } -// Gerer la notation [(#EXPOSER|on,off)] -function phraser_vieux_exposer($p) { - if ($a = $p->fonctions) { - preg_match('#([^,]*)(,(.*))?#', (string) $a[0][0], $regs); - $args = []; - if ($regs[1]) { - $a = new Texte(); - $a->texte = $regs[1]; - $args = ['', [$a]]; - if ($regs[3]) { - $a = new Texte(); - $a->texte = $regs[3]; - $args[] = [$a]; - } - } - $p->param[0] = $args; - $p->fonctions = []; - $p->nom_champ = 'EXPOSE'; - } -} - function phraser_vieux_modele($p) { normaliser_args_inclumodel($p); } diff --git a/ecrire/public/phraser_html.php b/ecrire/public/phraser_html.php index f577422629b181a685d07234f4e2ae261ed9e8bc..3912df8444d2046b785e11479e7a9db5e9ce3c62 100644 --- a/ecrire/public/phraser_html.php +++ b/ecrire/public/phraser_html.php @@ -627,12 +627,7 @@ function phraser_champs_interieurs(string $texte, int $no_ligne, string $sep): a function phraser_vieux(&$champ) { $nom = $champ->nom_champ; - if ($nom == 'EXPOSER') { - if (!function_exists('phraser_vieux_exposer')) { - include_spip('public/normaliser'); - } - phraser_vieux_exposer($champ); - } elseif ($champ->param) { + if ($champ->param) { if ($nom == 'FORMULAIRE_RECHERCHE') { if (!function_exists('phraser_vieux_recherche')) { include_spip('public/normaliser');