From a7b8f584939880912a0ba7f81c8de065fcff53b5 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Tue, 20 Jun 2006 22:03:04 +0000
Subject: [PATCH] =?UTF-8?q?*=20supprime=20les=20"style=3D''"=20inutiles=20?=
=?UTF-8?q?de=20reduire=5Fimage=20*=20utilise=20<span=20class=3D"spip=5Fdo?=
=?UTF-8?q?cuments..."><img=20/></span>=20pour=20les=20<IMG1|left>=20pour?=
=?UTF-8?q?=20povuoir=20appliquer=20des=20CSS=20de=20fa=C3=A7on=20plus=20u?=
=?UTF-8?q?niforme=20(=C3=A0=20la=20demande=20de=20tetue)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/documents.php | 6 ++++--
ecrire/inc/filtres.php | 9 +++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php
index 4c4ac8d9e9..265e59f8aa 100644
--- a/ecrire/inc/documents.php
+++ b/ecrire/inc/documents.php
@@ -374,7 +374,8 @@ function integre_image($id_document, $align, $type_aff) {
# mode <span ...> : ne pas mettre d'attributs de type block sinon MSIE Windows refuse de faire des liens dessus
if ($span == 'span') {
$vignette = inserer_attribut($vignette, 'style', $float.'width:'.$width.'px;');
- $vignette = inserer_attribut($vignette, 'class', "spip_document_$id_document spip_documents$class_align");
+ #$vignette = inserer_attribut($vignette, 'class', "spip_document_$id_document spip_documents$class_align");
+ $vignette = "<span class='spip_document_$id_document spip_documents$class_align'>$vignette</span>";
return $vignette;
}
# mode <div ...>
@@ -384,7 +385,8 @@ function integre_image($id_document, $align, $type_aff) {
// mettre au moins 120px
if (strlen($txt) AND $width < 120) $width = 120;
$width = 'width: '.$width.'px;';
- $style = " style='$float$width'";
+ if (strlen($style = "$float$width"))
+ $style = " style='$style'";
}
return
"<div class='spip_document_$id_document spip_documents$class_align'$style>"
diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php
index 2c39fc6ac8..663c0fcfb2 100644
--- a/ecrire/inc/filtres.php
+++ b/ecrire/inc/filtres.php
@@ -827,10 +827,11 @@ function reduire_image($texte, $taille = -1, $taille_y = -1) {
// En cas de span spip_documents, modifier le style=...width:
if($tag[1]
AND $w = extraire_attribut($reduit, 'width')) {
- $texte = str_replace($tag[1],
- inserer_attribut($tag[1], 'style',
- preg_replace(", width: *\d+px,", " width: ${w}px",
- extraire_attribut($tag[1], 'style'))), $texte);
+ $style = preg_replace(", width: *\d+px,", " width: ${w}px",
+ extraire_attribut($tag[1], 'style'));
+ $replace = inserer_attribut($tag[1], 'style', $style);
+ $replace = str_replace(" style=''", '', $replace);
+ $texte = str_replace($tag[1], $replace, $texte);
}
$texte = str_replace($tag[3], $reduit, $texte);
--
GitLab