diff --git a/formulaires/inc-upload_document.html b/formulaires/inc-upload_document.html
index 66ad53456ed7461125ad0fb7aecb2fa226fdbdb7..656cdb4df030ab4b98aeb2fa15b24dfa96002bec 100644
--- a/formulaires/inc-upload_document.html
+++ b/formulaires/inc-upload_document.html
@@ -1,5 +1,3 @@
-[(#GET{mediatheque,[(#ENV{objet,''}|et{#ENV{id_objet,''}}|et{#ENV{proposer_media}})]})]
-
 #SET{domid,_#ENV{mode}|concat{'_',#ENV{id,new}}}
 #SET{methode,upload}
 [(#ENV{joindre_mediatheque}|oui)#SET{methode,mediatheque}]
@@ -13,7 +11,7 @@
 	#SET{methode_upload,#CLE}
 	<div class='joindre_mode#GET{domid}[(#GET{methode}|=={#CLE}|non)none-js]' id='joindre_#CLE#GET{domid}'>
 
-		[(#INCLURE{fond=formulaires/methodes_upload/#CLE, env, mediatheque=#ENV{objet,''}|et{#ENV{id_objet,''}}|et{#ENV{proposer_media}}})]
+		<INCLURE{fond=formulaires/methodes_upload/#CLE,env,domid=#GET{domid}} />
 
 		<div class='sourceup'>
 			[(#SET{cpt,1})]
diff --git a/formulaires/methodes_upload/distant.html b/formulaires/methodes_upload/distant.html
index 3cc4791027de49d8969e28bbbd07777ae1547b33..ecf37c6b6ac9fd823dde5cb53e7e94ebb7e8e01a 100644
--- a/formulaires/methodes_upload/distant.html
+++ b/formulaires/methodes_upload/distant.html
@@ -1,8 +1,8 @@
 <div class="editer-groupe">
     <div class='editer editer_url[ (#ENV**{erreurs}|table_valeur{url}|oui)erreur]'>
-        <label for='url#GET{domid}'><:medias:info_referencer_doc_distant:></label>[
+        <label for='url#ENV{domid}'><:medias:info_referencer_doc_distant:></label>[
         <span class='erreur_message'>(#ENV**{erreurs}|table_valeur{url})</span>
-        ]<input class='text' type="text" name="url" value='#ENV{url}' id="url#GET{domid}"/>
+        ]<input class='text' type="text" name="url" value='#ENV{url}' id="url#ENV{domid}"/>
         <!--editer_url-->
     </div>
 </div>
\ No newline at end of file
diff --git a/formulaires/methodes_upload/ftp.html b/formulaires/methodes_upload/ftp.html
index faa6c0cfef891b50e5cf1fed89c3fc9c59583073..b55287c2b9f0ab93f98c0f31e0285521caeab7bf 100644
--- a/formulaires/methodes_upload/ftp.html
+++ b/formulaires/methodes_upload/ftp.html
@@ -1,8 +1,8 @@
 <div class="editer-groupe">
     [<div class='editer editer_cheminftp[ (#ENV**{erreurs}|table_valeur{cheminftp}|oui)erreur]'>
-        <label for='cheminftp#GET{domid}'>[(#VAL{info_selectionner_fichier}|_T{#ARRAY{upload,#ENV*{_dir_upload_ftp}}})]</label>[
+        <label for='cheminftp#ENV{domid}'>[(#VAL{info_selectionner_fichier}|_T{#ARRAY{upload,#ENV*{_dir_upload_ftp}}})]</label>[
         <span class='erreur_message'>(#ENV**{erreurs}|table_valeur{cheminftp})</span>
-        ]<select name='cheminftp' id='cheminftp#GET{domid}' size='1'>
+        ]<select name='cheminftp' id='cheminftp#ENV{domid}' size='1'>
         <option value=''>&gt;&gt;</option>
         (#ENV*{_options_upload_ftp})
         </select>
diff --git a/formulaires/methodes_upload/mediatheque.html b/formulaires/methodes_upload/mediatheque.html
index 30992ddf5cd6d5466f497956f4256c8bf8da59b6..0efa785f3067b58dd56716b78fb2a454b9ffa406 100644
--- a/formulaires/methodes_upload/mediatheque.html
+++ b/formulaires/methodes_upload/mediatheque.html
@@ -1,14 +1,14 @@
 <div class="editer-groupe">
     <div class='editer editer_refdoc_joindre[ (#ENV**{erreurs}|table_valeur{refdoc_joindre}|oui)erreur]'>
-        <label for='refdoc_joindre#GET{domid}'><:medias:label_refdoc_joindre:></label>[
+        <label for='refdoc_joindre#ENV{domid}'><:medias:label_refdoc_joindre:></label>[
         <span class='erreur_message'>(#ENV**{erreurs}|table_valeur{refdoc_joindre})</span>
-        ]<input class='text' type="text" name="refdoc_joindre" value='#ENV{refdoc_joindre}' id="refdoc_joindre#GET{domid}"/>
+        ]<input class='text' type="text" name="refdoc_joindre" value='#ENV{refdoc_joindre}' id="refdoc_joindre#ENV{domid}"/>
         <input class='submit' type="button" name="parcourir" value="<:medias:bouton_parcourir:>"
-            onclick="jQuery.modalboxload('#URL_ECRIRE{popin-choisir_document,var_zajax=contenu&selectfunc=mediaselect#GET{domid}}',{autoResize: true});"
+            onclick="jQuery.modalboxload('#URL_ECRIRE{popin-choisir_document,var_zajax=contenu&selectfunc=mediaselect#ENV{domid}}',{autoResize: true});"
         />
         <!--editer_refdoc_joindre-->
     </div>
 </div>
 <script type="text/javascript">/*<!\[CDATA\[*/
-function mediaselect#GET{domid}(id){jQuery.modalboxclose();jQuery("#refdoc_joindre#GET{domid}").attr('value','doc'+id).focus();jQuery('#joindre_mediatheque#GET{domid}>.boutons input').get(0).click();}
+function mediaselect#ENV{domid}(id){jQuery.modalboxclose();jQuery("#refdoc_joindre#ENV{domid}").attr('value','doc'+id).focus();jQuery('#joindre_mediatheque#ENV{domid}>.boutons input').get(0).click();}
 /*\]\]>*/</script>
\ No newline at end of file
diff --git a/formulaires/methodes_upload/upload.html b/formulaires/methodes_upload/upload.html
index f0a36573faa4fdea57811cf71eb3a8dfb98fc8a7..34bf3cddfd6cc6dcad188fd92eaeacd59cddc50a 100644
--- a/formulaires/methodes_upload/upload.html
+++ b/formulaires/methodes_upload/upload.html
@@ -1,8 +1,8 @@
 <div class="editer-groupe">
     <div class='editer editer_fichier_upload[ (#ENV**{erreurs}|table_valeur{fichier_upload}|oui)erreur]'>
-        <label for='fichier_upload#GET{domid}'><:bouton_upload:></label>[
+        <label for='fichier_upload#ENV{domid}'><:bouton_upload:></label>[
         <span class='erreur_message'>(#ENV**{erreurs}|table_valeur{fichier_upload})</span>
-        ]<input class='file multi' type="file" name="fichier_upload[]" value='[(#ENV{fichier_upload}|is_array|?{'', #ENV{fichier_upload}})]' id="fichier_upload#GET{domid}" size='11' />
+        ]<input class='file multi' type="file" name="fichier_upload[]" value='[(#ENV{fichier_upload}|is_array|?{'', #ENV{fichier_upload}})]' id="fichier_upload#ENV{domid}" size='11' />
         <!--editer_fichier_upload-->
     </div>
 </div>
\ No newline at end of file
diff --git a/paquet.xml b/paquet.xml
index 1288cc592ecc86f932530c58eeb87da07fe0801c..0bdeea82c36396fbde8ecaba0bdaf76cec47940e 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="medias"
 	categorie="multimedia"
-	version="2.20.1"
+	version="2.20.2"
 	etat="stable"
 	compatibilite="[3.2.0-dev;3.2.*]"
 	logo="prive/themes/spip/images/portfolio-32.png"