diff --git a/ecrire/inc_minipres.php b/ecrire/inc_minipres.php
index 07d55c9ba77060c51666580693c66b2dbb950539..f34395c2cc528be47f65e0efa064c04c63124aaf 100644
--- a/ecrire/inc_minipres.php
+++ b/ecrire/inc_minipres.php
@@ -189,7 +189,7 @@ function http_href_img($href, $img, $att, $title='', $style='', $class='', $evt=
 
 function generer_url_post_ecrire($script, $args='', $name='', $ancre='') {
 	$hidden = "";
-	$action = generer_url_ecrire($script, $args, false, true) ;
+	$action = generer_url_ecrire($script, $args);
 	if ($p = strpos($action, '?'))
 	  foreach(preg_split('/&(amp;)?/',substr($action,$p+1)) as $c) {
 		$hidden .= "\n<input name='" . 
diff --git a/ecrire/inc_naviguer.php b/ecrire/inc_naviguer.php
index f22003aa85261605e955efbc5c743f308c3ccceb..86efef4d92a8df21b25de79a92eadbaa238b350a 100644
--- a/ecrire/inc_naviguer.php
+++ b/ecrire/inc_naviguer.php
@@ -258,7 +258,7 @@ if ($id_rubrique>0 AND $GLOBALS['meta']['multi_rubriques'] == 'oui' AND ($GLOBAL
 
 	echo debut_block_invisible('languesrubrique');
 	echo "<div class='verdana2' align='center'>";
-	echo menu_langues('changer_lang', $langue_rubrique, '', $langue_parent, generer_url_ecrire("naviguer","action=coloniser&id_rubrique=$id_rubrique", true, true  ));
+	echo menu_langues('changer_lang', $langue_rubrique, '', $langue_parent, new Link(generer_url_ecrire("naviguer","action=coloniser&id_rubrique=$id_rubrique")));
 	echo "</div>\n";
 	echo fin_block();
 
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index abdcd1a25dcb36800b42c15e7ac2f4b66350d134..629ff7618fd9d767d4a622d26c66aac2b59ee15e 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -652,9 +652,10 @@ function generer_url_ecrire($script, $args="", $no_entities=false, $rel=false) {
 	  $site .= ((substr($site,-1) <> '/') ? '/' : '') . _DIR_RESTREINT_ABS;
 	else $site =  _DIR_RESTREINT;
 
-	if (substr($site,-1) == '/') {
-		$site = substr($site, 0, -1);
-		$script = '/' . $script;
+	if (!$site)
+	  $site = './';
+	elseif (substr($site,-1) != '/') {
+		$site .= '/';
 	}
 
 	$ext=(ereg('.php[3]?$', $script) ? '' :_EXTENSION_PHP).($args ? "?" : "");
diff --git a/spip_migre b/spip_migre
index afaa595971c22afbdacf8f3df2a99977d4508116..cadbd604ae5652a9c1829dee9ac7cf228da62eb5 100755
--- a/spip_migre
+++ b/spip_migre
@@ -56,8 +56,7 @@ done
 # Et maintenant, changer la definition de la fonction pivot
 # et eliminer les sequelles de - en _
 
-grep -v "script = '/'"  inc_utils.php |
-grep -v "= include_rustine" |
+grep -v "= include_rustine" inc_utils.php |
 sed 's/$ext=.*"\?/$args = "?exec=$script" . ($args ? "\&$args/; s,$script$ext,,; s/f = str_replace.*$/f = $nom;/' > x
 mv x inc_utils.php