From a37692b88c0abe88454eb2c3531d8df42c6e3c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=AFeul=20Rouquette?= <maieul@maieul.net>
Date: Sun, 15 Sep 2024 13:47:31 +0200
Subject: [PATCH] =?UTF-8?q?change:=20pour=20savoir=20si=20on=20peut=20r?=
=?UTF-8?q?=C3=A9duire=20une=20image,=20s'appuyer=20sur=20`=5Fimage=5Fexte?=
=?UTF-8?q?nsions=5Facceptees=5Fen=5Fentree()`=20et=20pas=20`=5Fimage=5Fex?=
=?UTF-8?q?tension=5Flogo()`.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ref: spip/spip#5999
---
formulaires/editer_document.php | 7 +------
medias_autoriser.php | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/formulaires/editer_document.php b/formulaires/editer_document.php
index 1a5fc005..92376620 100644
--- a/formulaires/editer_document.php
+++ b/formulaires/editer_document.php
@@ -66,12 +66,7 @@ function formulaires_editer_document_charger_dist(
$valeurs['type_document'] = $row['type_document'];
$valeurs['_inclus'] = $row['inclus'];
include_spip('inc/filtres_images_lib_mini');
- if (function_exists('_image_extensions_logos')) {
- $extensions = _image_extensions_logos();
- } else {
- $extensions = $GLOBALS['formats_logos'];
- }
- if (in_array($valeurs['extension'], $extensions)) {
+ if (in_array($valeurs['extension'], _image_extensions_acceptees_en_entree())) {
$valeurs['apercu'] = get_spip_doc($valeurs['fichier']);
}
diff --git a/medias_autoriser.php b/medias_autoriser.php
index df908fa3..ff239430 100644
--- a/medias_autoriser.php
+++ b/medias_autoriser.php
@@ -81,13 +81,8 @@ function autoriser_document_tailler_dist($faire, $type, $id, $qui, $options) {
// (on ne le propose pas pour les images qu'on sait
// lire : gif jpg png webp svg), sauf bug, ou document distant
include_spip('inc/filtres_images_lib_mini');
- if (function_exists('_image_extensions_logos')) {
- $extensions = _image_extensions_logos();
- } else {
- $extensions = $GLOBALS['formats_logos'];
- }
if (
- in_array($document['extension'], $extensions)
+ in_array($document['extension'], _image_extensions_acceptees_en_entree())
and $document['hauteur']
and $document['largeur']
and $document['distant'] !== 'oui'
--
GitLab