From 1994f85147e11ea0c39604ee82d8b05b436b15c1 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 19 Feb 2006 21:38:28 +0000
Subject: [PATCH] =?UTF-8?q?rajouter=20le=20lien=20vers=20le=20formulaire?=
 =?UTF-8?q?=20du=20mot=20dans=20le=20forum,=20honorer=20le=20ticket=20#106?=
 =?UTF-8?q?=20et=20syst=C3=A9matiser=20l'usage=20de=20quote=5Famp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/choix_mots.html   | 2 +-
 inc-calcul-outils.php3 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/choix_mots.html b/dist/choix_mots.html
index 4888c01bba..bbd78f87a9 100644
--- a/dist/choix_mots.html
+++ b/dist/choix_mots.html
@@ -8,7 +8,7 @@
 		    	id='mot#ID_MOT' 
 			[(#ID_MOT|in_any{#ENV*{ajouter_mot}, ''}|?
 				{'checked="checked"',''})] />
-		    #LOGO_MOT
+		    [(#LOGO_MOT|lien)]
 		<b><label for='mot#ID_MOT'>#TITRE</label></b><br />
 	</BOUCLE_M>
 		  </td></tr></table>
diff --git a/inc-calcul-outils.php3 b/inc-calcul-outils.php3
index 2739b2e9fd..4e02099968 100644
--- a/inc-calcul-outils.php3
+++ b/inc-calcul-outils.php3
@@ -52,14 +52,14 @@ function affiche_logos($logos, $lien, $align) {
 			."onmouseout=\"this.src='$arton'\"";
 
 	$milieu = "<img src=\"$arton\" alt=\"\""
-		. ($align ? " align='$align'" : '') 
+		. ($align ? " align=\"$align\"" : '') 
 		. $taille
 		. $mouseover
 		. " style='border-width: 0px;' class='spip_logos' />";
 
 	return (!$lien ? $milieu :
 		('<a href="' .
-		 str_replace('&', '&amp;', $lien) .
+		 quote_amp($lien) .
 		'">' .
 		$milieu .
 		'</a>'	 ));
-- 
GitLab