From 48780fcadbc24fd1c20c3ec35ad2c6533bba9cb0 Mon Sep 17 00:00:00 2001
From: ARNO* <arno@rezo.net>
Date: Wed, 5 Jul 2006 11:41:15 +0000
Subject: [PATCH] =?UTF-8?q?Gros=20bug=20dans=20nommage=20des=20images=20fi?=
=?UTF-8?q?ltre=CC=81es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/filtres.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php
index 9529f0313c..61b86ed804 100644
--- a/ecrire/inc/filtres.php
+++ b/ecrire/inc/filtres.php
@@ -899,11 +899,8 @@ function valeurs_image_trans($img, $effet, $forcer_format = false) {
$term_fonction_dest = $terminaison_dest;
if ($term_fonction_dest == "jpg") $term_fonction_dest = "jpeg";
- // Placer le fichier destination dans IMG/cache-gd2/
- if (ereg("\/", $fichier_dest)) {
- $fichier_dest = substr($fichier_dest, strrpos($fichier_dest,"/")+1, strlen($fichier_dest));
- }
$fichier_dest = md5($fichier_dest);
+
$fichier_dest = sous_repertoire(_DIR_IMG, "cache-gd2") . $fichier_dest . "." .$terminaison_dest;
$fonction_imagecreatefrom = "imagecreatefrom".$term_fonction;
@@ -1124,7 +1121,7 @@ function image_masque($im, $masque, $pos="") {
$pos = md5(serialize($variable));
- $image = valeurs_image_trans($im, "$masque$pos", "png");
+ $image = valeurs_image_trans($im, "masque-$masque-$pos", "png");
if (!$image) return("");
$x_i = $image["largeur"];
--
GitLab