diff --git a/ecrire/admin_vider.php3 b/ecrire/admin_vider.php3
index 4fa9bdc5f46cd338cb0f39809145b59cce44fee0..3c27361bc1cf4efe116bcd6038a0b46a7c64385e 100644
--- a/ecrire/admin_vider.php3
+++ b/ecrire/admin_vider.php3
@@ -52,16 +52,14 @@ echo _T('texte_vider_cache')."</FONT></B></TD></TR>";
 
 echo "<TR><TD class='serif'>";
 
-echo "\n<p align='justify'>"._T('texte_suppression_fichiers')."<p align='justify'>"._T('texte_recalcul_page');
+echo "\n<p align='justify'>"._T('texte_suppression_fichiers'),
+	"<p align='justify'>"._T('texte_recalcul_page');
 
 echo "\n<FORM ACTION='../spip_cache.php3' METHOD='post'>";
-
-$hash = calculer_action_auteur("purger_cache");
-
 echo "\n<INPUT TYPE='hidden' NAME='id_auteur' VALUE='$connect_id_auteur'>";
-echo "\n<INPUT TYPE='hidden' NAME='hash' VALUE='$hash'>";
+echo "\n<INPUT TYPE='hidden' NAME='hash' VALUE='" . calculer_action_auteur("purger_cache") . "'>";
 echo "\n<INPUT TYPE='hidden' NAME='purger_cache' VALUE='oui'>";
-echo "\n<INPUT TYPE='hidden' NAME='redirect' VALUE='admin_vider.php3'>";
+echo "\n<INPUT TYPE='hidden' NAME='redirect' VALUE='" . _DIR_RESTREINT_ABS . "admin_vider.php3'>";
 echo "\n<p><DIV align='right'><INPUT CLASS='fondo' TYPE='submit' NAME='valider' VALUE='"._T('bouton_vider_cache')."'></FORM></DIV>";
 echo "</TD></TR>";
 echo "</TABLE>";
diff --git a/ecrire/inc_abstract_sql.php3 b/ecrire/inc_abstract_sql.php3
index cf25a48223ce8c72f3ffc3bb165964633af6a6fe..729b3b41db945970b5895cdaa70828cd361858eb 100644
--- a/ecrire/inc_abstract_sql.php3
+++ b/ecrire/inc_abstract_sql.php3
@@ -40,7 +40,7 @@ function spip_abstract_select (
 		if (!function_exists($f)) {
 		  // non, il est decrit dans le fichier ad hoc
 			$d = 'inc_connect-' . $serveur .'.php3';
-			if (@file_exists('ecrire/' . $d))
+			if (@file_exists(_DIR_RESTREINT . $d))
 				include_ecrire($d);
 			$f = spip_abstract_serveur($f, $serveur);
 		}
diff --git a/ecrire/inc_auth.php3 b/ecrire/inc_auth.php3
index 276fe1620fdc9d9044399e0fed191e2cb1d679c4..e485d389671377086a9c9fa609a2294b936ec088 100644
--- a/ecrire/inc_auth.php3
+++ b/ecrire/inc_auth.php3
@@ -104,14 +104,14 @@ function auth() {
 	else if ($GLOBALS['bonjour'] == 'oui') {
 		$link = new Link("../spip_cookie.php3?test_echec_cookie=oui");
 		$clean_link->delVar('bonjour');
-		$url = str_replace('/./', '/', 'ecrire/'.$clean_link->getUrl());
+		$url = str_replace('/./', '/', _DIR_RESTREINT_ABS .$clean_link->getUrl());
 		$link->addVar('var_url', $url);
 		redirige_par_entete($link->getUrl());
 	}
 
 	// Si pas authentifie, demander login / mdp
 	if (!$auth_login) {
-		$url = str_replace('/./', '/', 'ecrire/'.$clean_link->getUrl());
+		$url = str_replace('/./', '/',  _DIR_RESTREINT_ABS .$clean_link->getUrl());
 		redirige_par_entete("../spip_login.php3?var_url=".urlencode($url));
 	}
 
diff --git a/ecrire/inc_config.php3 b/ecrire/inc_config.php3
index aeb6fc4f85a32f5f6f96b1c59bfdd035be6e733f..0090dcebca5a58d9db8b8375bbc21140ef309ca8 100644
--- a/ecrire/inc_config.php3
+++ b/ecrire/inc_config.php3
@@ -288,7 +288,7 @@ function appliquer_modifs_config() {
 	if ($purger_skel) {
 		redirige_par_entete("../spip_cache.php3?purger_squelettes=oui&id_auteur=$connect_id_auteur&hash=" .
 				    calculer_action_auteur("purger_squelettes") .
-				    "&redirect=".
+				    "&redirect=".  _DIR_RESTREINT_ABS .
 				    urlencode($clean_link->getUrl()));
 	}
 }
diff --git a/ecrire/upgrade.php3 b/ecrire/upgrade.php3
index aaace8856dabad50050e149bd2ad107198d72345..d1fb85776fb2b7a2bd5f633e063f61c9cefaba73 100644
--- a/ecrire/upgrade.php3
+++ b/ecrire/upgrade.php3
@@ -65,14 +65,14 @@ if ($ok) {
 	ecrire_acces();
 	init_config();
 
-	$hash = calculer_action_auteur("purger_cache");
-	$redirect = rawurlencode("index.php3");
 }
 
 fin_admin($upgrade_titre);
 
-if ($ok)
-	@header ("Location: ../spip_cache.php3?purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=$redirect");
+if ($ok) {
+	$hash = calculer_action_auteur("purger_cache");
+	@header ("Location: ../spip_cache.php3?purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=" .  _DIR_RESTREINT_ABS . "index.php3");
+ }
 else {
 	include_ecrire ('inc_lang.php3');
 	echo _T('alerte_maj_impossible', array('version' => $spip_version));
diff --git a/inc-public-global.php3 b/inc-public-global.php3
index c99ec2ef880cc9971cc62d6b4fbff0025e2b3c6e..a951d06002a07a17c0552a6af26532272b53874e 100644
--- a/inc-public-global.php3
+++ b/inc-public-global.php3
@@ -205,7 +205,7 @@ function afficher_page_globale ($fond, $delais, &$use_cache) {
 		top: 0px;
 		left: 0px;
 		position: absolute;
-		"><a href="'.$url.'"><img src="ecrire/img_pack/naviguer-site.png" align="left" border="0" /></a>
+		"><a href="'.$url.'"><img src="' . _DIR_IMG_PACK . 'naviguer-site.png" align="left" border="0" /></a>
 &nbsp; '.majuscules(_T('previsualisation')).'</div>';
 	}
 
diff --git a/spip_cache.php3 b/spip_cache.php3
index 4658ec486cfef8b292d88cc7f52def8fe23f8ea2..a6f9c4729c43c9804ec7030c35167963b2d184db 100644
--- a/spip_cache.php3
+++ b/spip_cache.php3
@@ -15,6 +15,6 @@ if ($purger_squelettes == "oui") {
 	if (verifier_action_auteur("purger_squelettes", $hash, $id_auteur))
 	  purger_squelettes();
 }
-redirige_par_entete("./ecrire/" . $redirect);
+redirige_par_entete($redirect);
 
 ?>