diff --git a/formulaires/editer_document.php b/formulaires/editer_document.php index 1a5fc005acf3d404e645d5054cb00b896f1d8036..923766200b362e011eaed208defb32d15c281a68 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 df908fa3e9f7a8807e826695cb42bf9a528a3e27..ff23943089798ce69eefce236a2a96cf5aa43a93 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'