X-Git-Url: http://git.cyclocoop.org/?p=velocampus%2Fweb%2Fwww.git;a=blobdiff_plain;f=www%2Fecrire%2Finc%2Fimport.php;h=f31b3265a49d6235db9023e0a337c88e7ebb5fc4;hp=6f3b8fdfb9934aca3eef9c74675f90218bd74b53;hb=e99f0878011913365e49b30d90e496c24c301393;hpb=80b4d3e85f78d402ed2e73f8f5d1bf4c19962eed

diff --git a/www/ecrire/inc/import.php b/www/ecrire/inc/import.php
index 6f3b8fd..f31b326 100644
--- a/www/ecrire/inc/import.php
+++ b/www/ecrire/inc/import.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2011                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -460,7 +460,7 @@ function import_affiche_javascript($taille)
 
 
 // http://doc.spip.org/@affiche_progression_javascript
-function affiche_progression_javascript($abs_pos,$size, $table="") {
+function affiche_progression_javascript($abs_pos,$size, $table="", $retour='') {
 
 	include_spip('inc/charsets');
 	echo "\n<script type='text/javascript'><!--\n";
@@ -472,8 +472,9 @@ function affiche_progression_javascript($abs_pos,$size, $table="") {
 			echo "document.progression.recharge.value='".str_replace("'", "\\'", unicode_to_javascript(html2unicode(_T('avis_erreur').": $x")))." ';\n";
 		}
 		else {
+			if (!$retour) $retour = self();
 			echo "document.progression.recharge.value='".str_replace("'", "\\'", unicode_to_javascript(html2unicode(_T('info_fini'))))."';\n";
-			echo "window.setTimeout('location.href=\"".self()."\";',0);";
+			echo "window.setTimeout('location.href=\"$retour\";',0);";
 		}
 	}
 	else {