diff --git a/dist/article.html b/dist/article.html index bd5c31e818ec1d0da2d6090eb7c304617f069808..5e6f4358a7fea89092986a44388fa07b2bb30ce0 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"> </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 05bb6dfd123531c6590828d9e7b537ee53888a08..cedd4dbc0e743b52009ecbbf06b5d3078ba5cb5d 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 6ecf2c7350003cd083cd40b5843f105000e06fe9..8441033da56b783be2c91daeea2bff037ebceb81 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; }