From: Pierre Habouzit (MadCoder <pierre.habouzit@m4x.org>
Date: Sat, 15 Jan 2005 02:11:20 +0000 (+0000)
Subject: one little thing for NL + changelog entry
X-Git-Tag: xorg/old~426
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=dd9c5348fc8c84b3f821c98f565055512d107d2f;p=platal.git

one little thing for NL + changelog entry

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-330
---

diff --git a/ChangeLog b/ChangeLog
index 05ffa3a..9bcba82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ New :
 		- More homogenous date formating (use %x / %X everywhere).			-MC
 		- No more .head.tpl. (thanks to JM for the tip).					-MC
 		- Strip unnecessary spaces from templates at compile time.			-MC
+		- Allow users to choose email formats globally.						-Car
 
 	* Contacts :
 		- Brand new PDF of the contact list (using FPDF).					-MC
diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php
index f6ef54c..5055341 100644
--- a/include/newsletter.inc.php
+++ b/include/newsletter.inc.php
@@ -173,8 +173,7 @@ class NewsLetter
 	    .  '<div class="foot">'
 	    .  "[<a href=\"$url/newsletter/\">archives</a>&nbsp;|&nbsp;"
 	    .  "<a href=\"$url/newsletter/submit.php\">écrire dans la NL</a>&nbsp;|&nbsp;"
-	    .  "<a href=\"$url/newsletter/?out=1\">ne plus recevoir</a>&nbsp;|&nbsp;"
-	    .  "<a href=\"$url/newsletter/?in=text\">recevoir en texte brut</a>]"
+	    .  "<a href=\"$url/newsletter/?out=1\">ne plus recevoir</a>]"
 	    .  '</div>';
 	} else {
 	    return "\n\n--------------------------------------------------------------------\n"
@@ -183,8 +182,7 @@ class NewsLetter
 		 . "\n"
 		 . "archives : [$url/newsletter/]\n"
 		 . "écrire   : [$url/newsletter/submit.php]\n"
-		 . "ne plus recevoir: [$url/newsletter/?out=1]\n"
-		 . "recevoir en HTML: [$url/newsletter/?in=html]\n";
+		 . "ne plus recevoir: [$url/newsletter/?out=1]\n";
 	}
     }