From 63d3325b07f521ad954c6707007ffefddfabe8ef Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@fenron.net>
Date: Mon, 18 Jun 2007 22:08:39 +0000
Subject: [PATCH] welcome_new can be NULL, so use "" instead of rendering
 "None".  - Legacy-Id: 514

---
 ietf/templates/mailinglists/list_summary.html | 2 +-
 ietf/templates/mailinglists/list_summary.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/mailinglists/list_summary.html b/ietf/templates/mailinglists/list_summary.html
index 64c81679f..330e75b96 100644
--- a/ietf/templates/mailinglists/list_summary.html
+++ b/ietf/templates/mailinglists/list_summary.html
@@ -10,7 +10,7 @@
 <tr><td> Administrator(s): </td><td><pre>{{ list.admins|escape }}</pre></td></tr>
 <tr><td> Email address(es) of initial subscriber(s) (optional): </td><td><pre>{{ list.initial_members|escape }}</pre></td></tr>
 <tr><td> Welcome message for initial subscriber(s) (optional): </td><td>{{ list.welcome_message|linebreaksbr }}</td></tr>
-<tr><td> Welcome message for new subscriber(s) (optional): </td><td>{{ list.welcome_new|linebreaksbr }}</td></tr>
+<tr><td> Welcome message for new subscriber(s) (optional): </td><td>{% filter linebreaksbr %}{% firstof list.welcome_new "" %}{% endfilter %}</td></tr>
 <tr><td> Required steps for subscription: </td><td>{{ list.get_subscription_display }}</td></tr>
 <tr><td> Messages to this list can be posted by:</td><td>{{ list.get_post_who_display }}</td></tr>
 <tr><td> Administrator approval required for posts: </td><td>{{ list.post_admin|yesno:"YES,NO" }}</td></tr>
diff --git a/ietf/templates/mailinglists/list_summary.txt b/ietf/templates/mailinglists/list_summary.txt
index 9f7d10f91..270548fd2 100644
--- a/ietf/templates/mailinglists/list_summary.txt
+++ b/ietf/templates/mailinglists/list_summary.txt
@@ -23,7 +23,7 @@ Welcome message for initial subscriber(s) (optional):
 {{ list.welcome_message }}
 
 Welcome message for new subscriber(s) (optional):
-{{ list.welcome_new }}
+{% firstof list.welcome_new "" %}
 
 Required steps for subscription: {{ list.get_subscription_display }}