diff --git a/formulaires/joindre_document.php b/formulaires/joindre_document.php index 14942b4db655e70f67cffa36ed6ace131964d04a..4058f482580407169ebfba2952eb5221d23044a2 100644 --- a/formulaires/joindre_document.php +++ b/formulaires/joindre_document.php @@ -153,7 +153,11 @@ function formulaires_joindre_document_traiter_dist($id_document='new',$id_objet= // on joint un document deja dans le site if (_request('joindre_mediatheque')){ $refdoc_joindre = _request('refdoc_joindre'); - $refdoc_joindre = strtr($refdoc_joindre,";,-"," "); + $refdoc_joindre = strtr($refdoc_joindre,";,"," "); + $refdoc_joindre = preg_replace(',\b(doc|document|img),','',$refdoc_joindre); + // expliciter les intervales xxx-yyy + while(preg_match(",\b(\d+)-(\d+)\b,",$refdoc_joindre,$m)) + $refdoc_joindre = str_replace($m[0],implode(" ",range($m[1],$m[2])),$refdoc_joindre); $refdoc_joindre = explode(" ",$refdoc_joindre); include_spip('action/editer_document'); foreach($refdoc_joindre as $j){ @@ -161,7 +165,7 @@ function formulaires_joindre_document_traiter_dist($id_document='new',$id_objet= // lier le parent en plus $champs = array('ajout_parents' => array("$objet|$id_objet")); document_modifier($j,$champs); - if (!$ance) + if (!$ancre) $ancre = $j; $sel[] = $j; $res['message_ok'] = _T('medias:document_attache_succes'); diff --git a/paquet.xml b/paquet.xml index fe4ec1916d6def173943ad91b6d6dde80b716fa6..2990c5ebde097972d2ab43d6595b86f1082cc47c 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ <paquet prefix="medias" categorie="multimedia" - version="2.7.36" + version="2.8.0" etat="stable" compatibilite="[3.0.0;3.1.*]" logo="prive/themes/spip/images/portfolio-32.png"