From 90476e853579f1d85eedb9ea2059a94183ccea1c Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 7 Jul 2022 16:52:16 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20appliquer=20=5FTRAITEMENT=5FTYPO=20sur?=
=?UTF-8?q?=20le=20champs=20CREDITS=20et=20renseigner=20le=20flag=20espace?=
=?UTF-8?q?=5Fprive=20quand=20on=20affiche=20la=20liste=20des=20documents?=
=?UTF-8?q?=20lies=20a=20un=20objet,=20afin=20que=20du=20HTML=20suspect=20?=
=?UTF-8?q?soit=20bien=20signal=C3=A9=20dans=20l'interface=20d'administrat?=
=?UTF-8?q?ion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Refs: https://git.spip.net/spip-team/securite/issues/4832
---
base/medias.php | 2 +-
inc/documenter_objet.php | 2 +-
modeles/document_desc.html | 2 +-
prive/squelettes/inclure/portfolio-documents.html | 4 ++--
prive/squelettes/inclure/portfolio-images-legacy.html | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/base/medias.php b/base/medias.php
index 3557d19f..d94bff07 100644
--- a/base/medias.php
+++ b/base/medias.php
@@ -40,7 +40,7 @@ function medias_declarer_tables_interfaces($interfaces) {
$interfaces['table_date']['types_documents'] = 'date';
$interfaces['table_des_traitements']['FICHIER'][] = 'get_spip_doc(%s)';
-
+ $interfaces['table_des_traitements']['CREDITS']['spip_documents'] = _TRAITEMENT_TYPO;
return $interfaces;
}
diff --git a/inc/documenter_objet.php b/inc/documenter_objet.php
index e912344b..0d18d6b2 100644
--- a/inc/documenter_objet.php
+++ b/inc/documenter_objet.php
@@ -44,7 +44,7 @@ function inc_documenter_objet_dist($id, $type) {
$marquer_doublons_doc = charger_fonction('marquer_doublons_doc', 'inc');
$marquer_doublons_doc($champs, $id, $type, $id_table_objet, $table_objet, $spip_table_objet, '', $serveur);
- $contexte = ['objet' => $type, 'id_objet' => $id];
+ $contexte = ['objet' => $type, 'id_objet' => $id, 'espace_prive' => test_espace_prive()];
return recuperer_fond('prive/objets/contenu/portfolio_document', array_merge($_GET, $contexte));
}
diff --git a/modeles/document_desc.html b/modeles/document_desc.html
index b3c86240..a89ca16a 100644
--- a/modeles/document_desc.html
+++ b/modeles/document_desc.html
@@ -108,4 +108,4 @@ Distribue sous licence GPL
<div class="nettoyeur"></div>
</div>
-</BOUCLE_docslies>
\ No newline at end of file
+</BOUCLE_docslies>
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index 6b87ae64..1c92a84a 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -16,7 +16,7 @@
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
<div class="sortable">
<BOUCLE_illustrations(DOCUMENTS documents_liens types_documents){media=image}{id_objet}{objet}{par rang_lien, num titre, date,id_document}{pagination 50}{statut?}{si #CONST{_COMPORTEMENT_HISTORIQUE_PORTFOLIO}|non}>
- #MODELE{document_desc,id_document,id_objet,objet}
+ #MODELE{document_desc,id_document,id_objet,objet,espace_prive}
</BOUCLE_illustrations>
</div>
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
@@ -41,7 +41,7 @@
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
<div class="sortable">
<BOUCLE_documents(DOCUMENTS documents_liens types_documents){media!=image}{mode!=vignette}{id_objet}{objet}{par rang_lien, num titre, date,id_document}{pagination 50}{statut?}>
- #MODELE{document_desc,id_document,id_objet,objet}
+ #MODELE{document_desc,id_document,id_objet,objet,espace_prive}
</BOUCLE_documents>
</div>
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
diff --git a/prive/squelettes/inclure/portfolio-images-legacy.html b/prive/squelettes/inclure/portfolio-images-legacy.html
index 87e76e65..80cc1989 100644
--- a/prive/squelettes/inclure/portfolio-images-legacy.html
+++ b/prive/squelettes/inclure/portfolio-images-legacy.html
@@ -5,7 +5,7 @@
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
<div class="sortable">
<BOUCLE_illustrations(DOCUMENTS documents_liens types_documents){media=image}{mode=image}{id_objet}{objet}{par rang_lien, num titre, date,id_document}{pagination 50}{statut?}>
- #MODELE{document_desc,id_document,id_objet,objet}
+ #MODELE{document_desc,id_document,id_objet,objet,espace_prive}
</BOUCLE_illustrations>
</div>
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
@@ -26,7 +26,7 @@
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
<div class="sortable">
<BOUCLE_portfolio(DOCUMENTS documents_liens types_documents){media=image}{mode=document}{id_objet}{objet}{par rang_lien, num titre, date,id_document}{pagination 50}{statut?}>
- #MODELE{document_desc,id_document,id_objet,objet}
+ #MODELE{document_desc,id_document,id_objet,objet,espace_prive}
</BOUCLE_portfolio>
</div>
[<nav class='pagination'>(#PAGINATION{prive})</nav>]
@@ -38,4 +38,4 @@
]
</div>
#SET{nbdocs,#GET{nbdocs}|plus{#GRAND_TOTAL}}
-</B_portfolio>
\ No newline at end of file
+</B_portfolio>
--
GitLab