diff --git a/inc-calcul-squel.php3 b/inc-calcul-squel.php3 index 07e21b80ecf30a27041a539889e6b582d0032c73..75c0ead727ca7cc542efca4ed10043ab6a11c145 100644 --- a/inc-calcul-squel.php3 +++ b/inc-calcul-squel.php3 @@ -1416,7 +1416,7 @@ function calculer_champ($id_champ, $id_boucle, $nom_var) else { \$$nom_var = \"\n<a name='formulaire_recherche'></a>\n\"; \$$nom_var .= \"\n<form action='$lien' method='get'>\"; - \$$nom_var .= \"\n<input type='text' name='recherche' value='Rechercher' size=20 class='formrecherche'>\"; + \$$nom_var .= \"\n<input type='text' name='recherche' value='Rechercher' size='20' class='formrecherche'>\"; \$$nom_var .= \"\n</form>\"; } "; diff --git a/inc-public-global.php3 b/inc-public-global.php3 index 2ca5c6a974fba40520ffb4dad6fe7493ba09ebb6..67fdb62239078fc390fc69617491e2fa2e4aedb6 100644 --- a/inc-public-global.php3 +++ b/inc-public-global.php3 @@ -157,7 +157,7 @@ if ($var_recherche AND $flag_ob AND $flag_preg_replace AND !$flag_preserver AND $effacer_cache = !$delais; // $delais peut etre modifie par une inclusion de squelette... if (file_exists($chemin_cache)) { - if (!$effacer_cache && !$flag_dynamique) { + if (!$effacer_cache && !$flag_dynamique && $recalcul != 'oui') { if ($lastmodified) { @Header ("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastmodified)." GMT"); @Header ("Expires: ".gmdate("D, d M Y H:i:s", $lastmodified + $delais)." GMT");