From 7fa5015b5c3f4266de48e682a4652dae3b6003ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 16 May 2024 10:00:58 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20dans=20la=20fonction=20`image=5Frecadre?=
 =?UTF-8?q?=5Favec=5Ffallback()`=20commencer=20par=20un=20`image=5Fpasse?=
 =?UTF-8?q?=5Fpartout()`=20pour=20prendre=20en=20compte=20l'exif=20de=20ro?=
 =?UTF-8?q?tation=20avant=20un=20recadre,=20c'est=20plus=20efficace=20pour?=
 =?UTF-8?q?=20un=20m=C3=AAme=20rendu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs: #5925
---
 ecrire/inc/filtres_images_mini.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ecrire/inc/filtres_images_mini.php b/ecrire/inc/filtres_images_mini.php
index 5792260c26..05164aed46 100644
--- a/ecrire/inc/filtres_images_mini.php
+++ b/ecrire/inc/filtres_images_mini.php
@@ -505,10 +505,11 @@ function image_recadre_avec_fallback(
 	$position = 'focus',
 	$background_color = 'white'
 ) {
+	$im = image_passe_partout($im, $width, $height);
 	if (function_exists('image_recadre') && ($GLOBALS['meta']['image_process'] ?? '') === 'gd2') {
-		return image_reduire(image_recadre($im, $width . ':' . $height, '-', $position, $background_color), $width, $height);
-	} else { return image_passe_partout($im, $width, $height);
+		$im = image_recadre($im, $width . ':' . $height, '-', $position, $background_color);
 	}
+	return $im;
 }
 
 /**
-- 
GitLab