diff --git a/ecrire/inc/texte.php b/ecrire/inc/texte.php
index 0c2ab38772d70a35db42983476e91552c9c37c2e..f85e032be62388aebfe4e852d2ff3c02f1e14c46 100644
--- a/ecrire/inc/texte.php
+++ b/ecrire/inc/texte.php
@@ -524,7 +524,7 @@ function typo($letexte, $echapper=true) {
 function extraire_lien ($regs) {
 	$lien_texte = $regs[1];
 
-	$lien_url = entites_html(trim($regs[3]));
+	$lien_url = entites_html(vider_url($regs[3]));
 	$compt_liens++;
 	$lien_interne = false;
 	if (ereg('^[[:space:]]*(art(icle)?|rub(rique)?|br(.ve)?|aut(eur)?|mot|site|doc(ument)?|im(age|g))?[[:space:]]*([[:digit:]]+)(#.*)?[[:space:]]*$', $lien_url, $match)) {
diff --git a/ecrire/public/interfaces.php b/ecrire/public/interfaces.php
index 91b77923aa319ccb44fe1141ceb80337ab434d3d..d06dde12a339fae296482a2e884d6164bef00f6b 100644
--- a/ecrire/public/interfaces.php
+++ b/ecrire/public/interfaces.php
@@ -267,7 +267,7 @@ $table_des_traitements['LIEN_TITRE'][]= 'typo(%s)';
 $table_des_traitements['LIEN_URL'][]= 'htmlspecialchars(vider_url(%s))';
 $table_des_traitements['MESSAGE'][]= 'propre(%s)';
 $table_des_traitements['NOM_SITE_SPIP'][]= 'typo(%s)';
-$table_des_traitements['NOM_SITE'][]= 'typo(%s)';
+$table_des_traitements['NOM_SITE'][]= '%s'; # construire_titre_lien -> typo
 $table_des_traitements['NOM'][]= 'typo(%s)';
 $table_des_traitements['PARAMETRES_FORUM'][]= 'htmlspecialchars(lang_parametres_forum(%s))';
 $table_des_traitements['PS'][]= 'propre(%s)';