diff --git a/dist/formulaires/administration.html b/dist/formulaires/administration.html
index 827f309114f9f9ddcb38ffdc0782cd07dbac9b23..2ca734ad2dbb9ac0a243e52d2361d46359df53e9 100644
--- a/dist/formulaires/administration.html
+++ b/dist/formulaires/administration.html
@@ -1,14 +1,32 @@
-<div[ class="(#ENV{divclass,spip-admin-bloc})"] dir="#LANG_DIR">[
-	<a href="(#ENV{analyser})" class="spip-admin-boutons"><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
-	<a href="[(#ENV{voir_article})]" class="spip-admin-boutons"><:admin_modifier_article:> ((#ENV{id_article}))</a>][
-	<a href="[(#ENV{voir_breve})]" class="spip-admin-boutons"><:admin_modifier_breve:> ((#ENV{id_breve}))</a>][
-	<a href="[(#ENV{voir_rubrique})]" class="spip-admin-boutons"><:admin_modifier_rubrique:> ((#ENV{id_rubrique}))</a>][
-	<a href="[(#ENV{voir_mot})]" class="spip-admin-boutons"><:admin_modifier_mot:> ((#ENV{id_mot}))</a>][
-	<a href="[(#ENV{voir_site})]" class="spip-admin-boutons"><:icone_modifier_site:> ((#ENV{id_syndic}))</a>][
-	<a href="[(#ENV{voir_auteur})]" class="spip-admin-boutons"><:admin_modifier_auteur:> ((#ENV{id_auteur}))</a>][
-	<a href="(#ENV{ecrire})" class="spip-admin-boutons"><:espace_prive:></a>]
-	<a href="[(#SELF|parametre_url{var_mode,#ENV{calcul}})]" class="spip-admin-boutons"><:admin_recalculer:>[(#ENV{use_cache})]</a>[
-	<a href="(#ENV{statistiques})" class="spip-admin-boutons">[<:info_visites:>&nbsp;(#ENV{visites})][;&nbsp;<:info_popularite_5:>&nbsp;(#ENV{popularite})]</a>][
-	<a href="(#ENV{preview})" class="spip-admin-boutons"><:previsualisation:></a>][
-	<a href="(#ENV{debug})" class="spip-admin-boutons"><:admin_debug:></a>]
+ <div[ class="(#ENV{divclass,spip-admin-bloc})"] dir="#LANG_DIR">[
+	<a href="(#ENV{analyser})" class="spip-admin-boutons"
+		id="analyser"><:analyse_xml:>[(#ENV{xhtml_error}|?{' *',''})]</a>][
+	<a href="[(#ENV{voir_article})]" class="spip-admin-boutons"
+		id="voir_article"><:admin_modifier_article:>
+			((#ENV{id_article}))</a>][
+	<a href="[(#ENV{voir_breve})]" class="spip-admin-boutons"
+		id="voir_breve"><:admin_modifier_breve:>
+			((#ENV{id_breve}))</a>][
+	<a href="[(#ENV{voir_rubrique})]" class="spip-admin-boutons"
+		id="voir_rubrique"><:admin_modifier_rubrique:>
+			((#ENV{id_rubrique}))</a>][
+	<a href="[(#ENV{voir_mot})]" class="spip-admin-boutons"
+		id="voir_mot"><:admin_modifier_mot:>
+			((#ENV{id_mot}))</a>][
+	<a href="[(#ENV{voir_site})]" class="spip-admin-boutons"
+		id="voir_site"><:icone_modifier_site:>
+			((#ENV{id_syndic}))</a>][
+	<a href="[(#ENV{voir_auteur})]" class="spip-admin-boutons"
+		id="voir_auteur"><:admin_modifier_auteur:>
+			((#ENV{id_auteur}))</a>][
+	<a href="(#ENV{ecrire})" class="spip-admin-boutons"
+		id="ecrire"><:espace_prive:></a>]
+	<a href="[(#SELF|parametre_url{var_mode,#ENV{calcul}})]" class="spip-admin-boutons"
+		id="var_mode"><:admin_recalculer:>[(#ENV{use_cache})]</a>[
+	<a href="(#ENV{statistiques})" class="spip-admin-boutons"
+		id="statistiques">[<:info_visites:>&nbsp;(#ENV{visites})][;&nbsp;<:info_popularite_5:>&nbsp;(#ENV{popularite})]</a>][
+	<a href="(#ENV{preview})" class="spip-admin-boutons"
+		id="preview"><:previsualisation:></a>][
+	<a href="(#ENV{debug})" class="spip-admin-boutons"
+		id="debug"><:admin_debug:></a>]
 </div>
\ No newline at end of file
diff --git a/ecrire/balise/formulaire_admin.php b/ecrire/balise/formulaire_admin.php
index 0ee93176fbbfc3ca36f8838525ea10292137a399..26dde4a3f814366997f620f9308ec42c8c5dd99a 100644
--- a/ecrire/balise/formulaire_admin.php
+++ b/ecrire/balise/formulaire_admin.php
@@ -65,7 +65,7 @@ function balise_FORMULAIRE_ADMIN_dyn($float='', $debug='') {
 
 	// Pas de "modifier ce..." ? -> donner "acces a l'espace prive"
 	if (!$env)
-		$env['ecrire'] = DIR_RESTREINT_ABS;
+		$env['ecrire'] = _DIR_RESTREINT_ABS;
 
 	$env['action'] = self('&');
 	$env['divclass'] = $float;
@@ -101,8 +101,8 @@ function admin_objet()
 	as $id => $obj) {
 		if (is_int($id)) $id = $obj;
 		$_id_type = id_table_objet($id);
-		if (isset($GLOBALS[$_id_type])) {
-			$id_type = sql_getfetsel($_id_type, table_objet_sql($id), "$_id_type=".intval($GLOBALS[$_id_type]));
+		if ($id_type = $GLOBALS[$_id_type]) {
+			$id_type = sql_getfetsel($_id_type, table_objet_sql($id), "$_id_type=".intval($id_type));
 			if ($id_type) {
 				$env[$_id_type] = $id_type;
 				$g = 'generer_url_ecrire_'.$obj;