From a1b10ab6b2cea33ef02b42741e01145bbe297261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= <maieul@maieul.net>
Date: Thu, 30 Jan 2020 17:22:54 +0100
Subject: [PATCH] Notice php
---
inc/formidable.php | 8 ++++++--
paquet.xml | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/inc/formidable.php b/inc/formidable.php
index 778810b1..13942465 100644
--- a/inc/formidable.php
+++ b/inc/formidable.php
@@ -514,10 +514,14 @@ function formidable_raccourcis_arobases_2_valeurs_champs($chaine, $saisies, $bru
}
$a_remplacer = array_flip($a_remplacer);
if ($brut) {
- $a_remplacer = array_intersect_key($valeurs, $a_remplacer);
+ if (is_array($valeurs)) {
+ $a_remplacer = array_intersect_key($valeurs, $a_remplacer);
+ }
}
else {
- $a_remplacer = array_intersect_key($valeurs_libellees, $a_remplacer);
+ if (is_array($valeurs_libellees)) {
+ $a_remplacer = array_intersect_key($valeurs_libellees, $a_remplacer);
+ }
}
$a_remplacer = array_merge($a_remplacer,array('nom_site_spip' => lire_config('nom_site')));
diff --git a/paquet.xml b/paquet.xml
index 1d59b477..021ae1a3 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="formidable"
categorie="communication"
- version="4.0.1"
+ version="4.0.2"
etat="stable"
compatibilite="[3.1.0;3.2.*]"
logo="images/formidable-64.png"
--
GitLab