diff --git a/ecrire/inc_calendrier.php b/ecrire/inc_calendrier.php
index 7bc999eec1cf216b1c16722169ec2d660971ea4e..a98464ef5fa505f0b59f3750c7caa3d2024f87eb 100644
--- a/ecrire/inc_calendrier.php
+++ b/ecrire/inc_calendrier.php
@@ -608,7 +608,7 @@ function http_calendrier_clics($annee, $mois, $jour, $clic)
 {
   global $bleu, $jaune, $vert;
   $href = "message_edit.php3?rv=$annee-$mois-$jour&new=oui";
-  $script = 'calendrier.php3' ; // ok pour espace de redac, pas pour public
+  $script =  $GLOBALS['PHP_SELF'] ;
   return "\n" .
     http_href("$script?type=jour&jour=$jour&mois=$mois&annee=$annee", $clic) .
     "\n" .
@@ -735,7 +735,8 @@ function http_calendrier_suite_heures($jour_today,$mois_today,$annee_today,
 
 function http_calendrier_agenda ($mois, $annee, $jour_ved, $mois_ved, $annee_ved, $semaine = false,  $script='', $ancre='') {
 
-  if (!$script) $script =  'calendrier.php3?' ;
+  if (!$script) $script =  $GLOBALS['PHP_SELF'] ;
+  if (!strpos($script, '?')) $script .= '?';
   if (!$mois) {$mois = 12; $annee--;}
   elseif ($mois==13) {$mois = 1; $annee++;}
   return 
diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3
index f05d0f6cf38c0d7953a0c128455edb5bf2654f68..7b74a519dc635dfdbe20bda7cdc4e1dc364571eb 100644
--- a/ecrire/inc_presentation.php3
+++ b/ecrire/inc_presentation.php3
@@ -2576,7 +2576,7 @@ document.write(\"" . addslashes(str_replace("\n", " ", $html))."\")");
 			$gadget .= "<table><tr>";
 			$gadget .= "<td valign='top' width='200'>";
 				$gadget .= "<div>";
-				$gadget .= http_calendrier_agenda($mois_today, $annee_today, $jour_today, $mois_today, $annee_today);
+				$gadget .= http_calendrier_agenda($mois_today, $annee_today, $jour_today, $mois_today, $annee_today, false, 'calendrier.php3');
 				$gadget .= "</div>";
 				$gadget .= "</td>";
 				if ($afficher_cal) {