dépôts
/
lhc
/
web
/
www.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SPIP] ~version 3.0.10-->3.0.11
[lhc/web/www.git]
/
www
/
plugins-dist
/
urls_etendues
/
urls
/
arbo.php
diff --git
a/www/plugins-dist/urls_etendues/urls/arbo.php
b/www/plugins-dist/urls_etendues/urls/arbo.php
index
9db8671
..
2afb8df
100644
(file)
--- a/
www/plugins-dist/urls_etendues/urls/arbo.php
+++ b/
www/plugins-dist/urls_etendues/urls/arbo.php
@@
-346,7
+346,8
@@
function declarer_url_arbo($type, $id_objet) {
if ($modifier_url
AND CONFIRMER_MODIFIER_URL
AND $url_propre
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;
$confirmer = true;
else
$confirmer = false;