From eb5e46c70290b5a94f13759a91bb946ed0b2ec2d Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Fri, 11 Dec 2015 15:59:00 +0000
Subject: [PATCH] Fix https://core.spip.net/issues/3617 : passer $set a
objet_modifier_champs pour qu'elle ne detecte les conflits sur $_POST que
quand c'est pertinent
---
action/editer_document.php | 6 ++++--
paquet.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/action/editer_document.php b/action/editer_document.php
index 1c3fe49c..8d134400 100644
--- a/action/editer_document.php
+++ b/action/editer_document.php
@@ -86,9 +86,10 @@ function document_inserer($id_parent = null, $set = null) {
* $set est un contenu (par defaut on prend le contenu via _request())
*
* @param int $id_document
- * @param array|bool $set
+ * @param array|null $set
+ * @return string|null
*/
-function document_modifier($id_document, $set = false) {
+function document_modifier($id_document, $set = null) {
include_spip('inc/modifier');
include_spip('inc/filtres');
@@ -122,6 +123,7 @@ function document_modifier($id_document, $set = false) {
if ($err = objet_modifier_champs('document', $id_document,
array(
+ 'data' => $set,
'invalideur' => $invalideur,
'indexation' => $indexation
),
diff --git a/paquet.xml b/paquet.xml
index ed43a82b..1d801ccc 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="medias"
categorie="multimedia"
- version="2.10.25"
+ version="2.10.26"
etat="stable"
compatibilite="[3.0.0;3.1.*]"
logo="prive/themes/spip/images/portfolio-32.png"
--
GitLab