diff --git a/inc-compilo.php3 b/inc-compilo.php3 index a0af9d82da480cd1c3c648e5344a74f1ce90e4a3..e1664575a5cb05367822a4793eeddd5a0cc18fd5 100644 --- a/inc-compilo.php3 +++ b/inc-compilo.php3 @@ -427,7 +427,7 @@ function compile_cas($tableau, $descr, &$boucles, $id_boucle='') { // inclure case 'include': $code = calculer_inclure($p, $descr, $boucles, $id_boucle); - $commentaire = '!' . $p->texte; + $commentaire = '<INCLURE ' . $p->texte . '>'; $avant=''; $apres=''; $altern = "''"; @@ -486,17 +486,19 @@ function compile_cas($tableau, $descr, &$boucles, $id_boucle='') { erreur_squelette(_T('zbug_info_erreur_squelette')); } // switch - if ($avant == "''") - $avant = ''; - if ($apres == "''") - $apres = ''; - if ($avant||$apres||($altern!="''")) { - $t = '$t' . $descr['niv']; - $res = (!$avant ? "" : "$avant . ") . - $t . - (!$apres ? "" : " . $apres"); - $code = "((strval($t = $code)!='')" - ." ?\n\t$tab($res) :\n\t$tab($altern))"; + if ($code != "''") { + if ($avant == "''") + $avant = ''; + if ($apres == "''") + $apres = ''; + if ($avant||$apres||($altern!="''")) { + $t = '$t' . $descr['niv']; + $res = (!$avant ? "" : "$avant . ") . + $t . + (!$apres ? "" : " . $apres"); + $code = "((strval($t = $code)!='')" + ." ?\n\t$tab($res) :\n\t$tab($altern))"; + } } if ($code != "''") $codes[]= (($GLOBALS['var_mode_affiche'] == 'validation') ? @@ -669,7 +671,9 @@ function calculer_squelette($squelette, $nom, $gram, $sourcefile) { } $secondes = spip_timer('calcul_skel'); - spip_log("calcul skel $sourcefile ($secondes)"); + spip_log("COMPIL ($secondes) [" + .preg_replace(',\.html$,', '', $sourcefile) + ."] CACHE/skel_$nom.php"); $squelette_compile = "<"."?php /*