X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=www%2Fplugins-dist%2Furls_etendues%2Furls%2Farbo.php;h=4d7aac2247d87066c85251b8416000f3fb1e4c05;hb=122c920eb07e3f665789f8734965b576e6c25515;hp=9db8671faa29e24e97d18d4c9af8a630c6fe41a4;hpb=226942065cd4f604eb464addf45a065c9e5bc916;p=lhc%2Fweb%2Fwww.git

diff --git a/www/plugins-dist/urls_etendues/urls/arbo.php b/www/plugins-dist/urls_etendues/urls/arbo.php
index 9db8671f..4d7aac22 100644
--- a/www/plugins-dist/urls_etendues/urls/arbo.php
+++ b/www/plugins-dist/urls_etendues/urls/arbo.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2013                                                *
+ *  Copyright (c) 2001-2014                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -346,7 +346,8 @@ function declarer_url_arbo($type, $id_objet) {
 	if ($modifier_url
 		AND CONFIRMER_MODIFIER_URL
 		AND $url_propre
-		AND $url != preg_replace('/,.*/', '', $url_propre))
+		// on essaye pas de regenerer une url en -xxx (suffixe id anti collision)
+		AND $url != preg_replace('/'.preg_quote(_url_propres_sep_id,'/').'.*/', '', $url_propre))
 		$confirmer = true;
 	else
 		$confirmer = false;