From dc4d95b3993e31047ea1434f0a8f87d27fe360be Mon Sep 17 00:00:00 2001
From: "brunobergot@gmail.com" <>
Date: Fri, 24 Jul 2015 14:23:49 +0000
Subject: [PATCH] =?UTF-8?q?Ne=20pas=20g=C3=A9n=C3=A9rer=20une=20erreur=20l?=
=?UTF-8?q?ors=20de=20l'=C3=A9dition=20d'un=20document=20plsu=20pr=C3=A9se?=
=?UTF-8?q?nt=20dans=20IMG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix https://core.spip.net/issues/3485
---
formulaires/editer_document.php | 4 +++-
paquet.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/formulaires/editer_document.php b/formulaires/editer_document.php
index 044fd440..f9fba17c 100644
--- a/formulaires/editer_document.php
+++ b/formulaires/editer_document.php
@@ -55,7 +55,9 @@ function formulaires_editer_document_charger_dist($id_document='new', $id_parent
// cas des maj de fichier directes par ftp
if ($valeurs['distant']!=='oui'){
include_spip('inc/renseigner_document');
- $infos = renseigner_taille_dimension_image(get_spip_doc($valeurs['fichier']),$valeurs['extension']);
+ $f = get_spip_doc($valeurs['fichier']);
+ if ($f AND @file_exists($f))
+ $infos = renseigner_taille_dimension_image($f,$valeurs['extension']);
if ($infos['taille']!=$valeurs['taille']
OR ($infos['type_image'] && ($infos['largeur']!=$valeurs['largeur']))
OR ($infos['type_image'] && ($infos['hauteur']!=$valeurs['hauteur']))){
diff --git a/paquet.xml b/paquet.xml
index 27400320..1f8eba30 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="medias"
categorie="multimedia"
- version="2.10.20"
+ version="2.10.21"
etat="stable"
compatibilite="[3.0.0;3.1.*]"
logo="prive/themes/spip/images/portfolio-32.png"
--
GitLab