diff --git a/action/ajouter_documents.php b/action/ajouter_documents.php index e3f275d9586be157d123e4c4046e2b03480261e5..211733a3efcc54b2959573abde7ddef3ea3f0334 100644 --- a/action/ajouter_documents.php +++ b/action/ajouter_documents.php @@ -233,7 +233,7 @@ function action_ajouter_un_document_dist($id_document, $file, $objet, $id_objet, // lier le parent si necessaire // attention au cas particulier du site 0 utilisé pour le logo du site - if ($objet and (($id_objet = intval($id_objet)) or $objet=='site')) { + if ($objet and (($id_objet = intval($id_objet)) or in_array($objet, ['site', 'rubrique']))) { $champs['parents'][] = "$objet|$id_objet"; } diff --git a/action/editer_document.php b/action/editer_document.php index cfb57b35df916c6e5227546b2d8f1908fc819e49..3b717c736de2fdf29927de2161bd002e0003b49c 100644 --- a/action/editer_document.php +++ b/action/editer_document.php @@ -281,7 +281,7 @@ function medias_revision_document_parents($id_document, $parents = null, $ajout foreach ($parents as $p) { $p = explode('|', $p); if (preg_match('/^[a-z0-9_]+$/i', $objet = $p[0]) - and (($p[1] = intval($p[1])) or $objet == 'site') + and (($p[1] = intval($p[1])) or in_array($objet, ['site', 'rubrique'])) ) { // securite $objets_parents[$p[0]][] = $p[1]; } diff --git a/paquet.xml b/paquet.xml index d4b4e2522ed6185526097da8dc0e29fac0ca6756..b94831fc3196eb51a1d064984f63d4671390a0ca 100644 --- a/paquet.xml +++ b/paquet.xml @@ -1,7 +1,7 @@ <paquet prefix="medias" categorie="multimedia" - version="2.25.0" + version="2.25.1" etat="stable" compatibilite="[3.3.0-dev;3.3.*]" logo="prive/themes/spip/images/portfolio-32.png"