From 614fb93489c8209b8f0edb1715c24f8d143f74d2 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 11 Jun 2005 13:59:47 +0000
Subject: [PATCH] =?UTF-8?q?surlignement=20des=20URL=5FFORUM=20quand=20la?=
 =?UTF-8?q?=20recherche=20est=20active=20suppression=20du=20titre=20typogr?=
 =?UTF-8?q?aphique=20dans=20le=20squelette=20par=20d=C3=A9faut?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/article.html       |  2 --
 ecrire/inc_filtres.php3 | 15 +++++++--------
 inc-balises.php3        |  5 +++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dist/article.html b/dist/article.html
index bd5c31e818..5e6f4358a7 100644
--- a/dist/article.html
+++ b/dist/article.html
@@ -127,8 +127,6 @@
 [(#DATE|nom_jour)] [(#DATE|affdate).]
 </div>
 
-[(#TITRE|image_typo{police=dustismo_bold.ttf, couleur=ff0000, taille=36, largeur=350})]
-
 <div style="line-height: 0em">&nbsp;</div><!-- Bug Mozilla http://bugzilla.mozilla.org/show_bug.cgi?id=200510 -->
 
 	<div class="encart">
diff --git a/ecrire/inc_filtres.php3 b/ecrire/inc_filtres.php3
index 05bb6dfd12..cedd4dbc0e 100644
--- a/ecrire/inc_filtres.php3
+++ b/ecrire/inc_filtres.php3
@@ -294,17 +294,16 @@ function vider_url($url) {
 function url_var_recherche($url) {
 	if (_request('recherche')
 	AND !ereg("var_recherche", $url)) {
+
+		list ($url,$ancre) = preg_split(',#,', $url, 2);
+		if ($ancre) $ancre='#'.$ancre;
+
 		$x = "var_recherche=".urlencode(_request('recherche'));
+
 		if (!strpos($url, '?'))
-		  return "$url?$x";
+			return "$url?$x$ancre";
 		else
-		  {
-		    $p = strpos($url, '#');
-		    if (!$p)
-		      return "$url&$x";
-		    else
-		      return substr($url,0,$p) . "&$x" . substr($url,$p+1);
-		  }
+			return "$url&$x$ancre";
 	}
 	else return $url;
 }
diff --git a/inc-balises.php3 b/inc-balises.php3
index 6ecf2c7350..8441033da5 100644
--- a/inc-balises.php3
+++ b/inc-balises.php3
@@ -240,6 +240,8 @@ function balise_URL_MOT_dist($p) {
 	$p->code = "generer_url_mot(" .
 	champ_sql('id_mot',$p) .
 	")";
+
+	if ($p->boucles[$p->nom_boucle ? $p->nom_boucle : $p->id_boucle]->hash)
 	$p->code = "url_var_recherche(" . $p->code . ")";
 
 	$p->statut = 'html';
@@ -256,6 +258,9 @@ function balise_URL_FORUM_dist($p) {
 	$p->code = "generer_url_forum(" .
 	champ_sql('id_forum',$p) .")";
 
+	if ($p->boucles[$p->nom_boucle ? $p->nom_boucle : $p->id_boucle]->hash)
+	$p->code = "url_var_recherche(" . $p->code . ")";
+
 	$p->statut = 'html';
 	return $p;
 }
-- 
GitLab