12 files changed, 23 insertions, 13 deletions
diff --git a/Mailman/Handlers/Cleanse.py b/Mailman/Handlers/Cleanse.py
index c3e7aa43..c684cd19 100644
--- a/Mailman/Handlers/Cleanse.py
+++ b/Mailman/Handlers/Cleanse.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -29,6 +29,8 @@ from Mailman.Handlers.CookHeaders import uheader
 cres = []
 for regexp in mm_cfg.ANONYMOUS_LIST_KEEP_HEADERS:
     try:
+        if regexp.endswith(':'):
+            regexp = regexp[:-1] + '$'
         cres.append(re.compile(regexp, re.IGNORECASE))
     except re.error, e:
         syslog('error',
@@ -65,6 +67,7 @@ def process(mlist, msg, msgdata):
         del msg['from']
         del msg['reply-to']
         del msg['sender']
+        del msg['organization']
         del msg['return-path']
         # Hotmail sets this one
         del msg['x-originating-email']
diff --git a/NEWS b/NEWS
index 547090e2..4aa6fd1a 100755
--- a/NEWS
+++ b/NEWS
@@ -123,14 +123,16 @@ Here is a history of user visible changes to Mailman.
       require running 'bin/arch --wipe' on any existing Romanian language
       lists in order to recode the list's archives, and will require recoding
       any edited templates in lists/LISTNAME/ro/*, templates/DOMAIN/ro/* and
-      templates/site/ro/*.  (LP: #1418735)
+      templates/site/ro/*.  It may also require recoding any existing
+      iso-8859-2 text in list attributes.  (LP: #1418735)
 
     - Mailman's character set for Russian has been changed from koi8-r to
       utf-8 and the templates and messages recoded.  This change will
       require running 'bin/arch --wipe' on any existing Russian language
       lists in order to recode the list's archives, and will require recoding
       any edited templates in lists/LISTNAME/ru/*, templates/DOMAIN/ru/* and
-      templates/site/ru/*.  (LP: #1418448)
+      templates/site/ru/*.  It may also require recoding any existing koi8-r
+      text in list attributes.  (LP: #1418448)
 
     - The Russian message catalog has been updated by Danil Smirnov.
 
@@ -146,6 +148,11 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Organization: headers are now unconditionally removed from posts to
+      anonymous lists.  Regexps in ANONYMOUS_LIST_KEEP_HEADERS weren't kept
+      if the regexp included the trailing ':'.  This is fixed too.
+      (LP: #1419132)
+
     - The admindb interface has been fixed so the the detail message body
       display doesn't lose part of a multi-byte character, and characters which
       are invalid in the message's charset are replaced rather than the whole
diff --git a/templates/ro/admlogin.html b/templates/ro/admlogin.html
index 058a62b6..b6a31b52 100755
--- a/templates/ro/admlogin.html
+++ b/templates/ro/admlogin.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <title>%(listname)s: Autentificare - %(who)s</title>
-  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
   <script>function sf(){document.f.adminpw.focus();}</script>
 </head>
 <body bgcolor="#ffffff" onLoad="sf()">
diff --git a/templates/ro/archidxhead.html b/templates/ro/archidxhead.html
index 8ed49bea..c584cfe1 100644
--- a/templates/ro/archidxhead.html
+++ b/templates/ro/archidxhead.html
@@ -3,7 +3,7 @@
   <HEAD>
      <title>Arhiva %(archive)s a listei %(listname)s după %(archtype)s</title>
      <META NAME="robots" CONTENT="noindex,follow">
-     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
      %(encoding)s
   </HEAD>
   <BODY BGCOLOR="#ffffff">
diff --git a/templates/ro/archtoc.html b/templates/ro/archtoc.html
index 0e24acd9..533c5503 100644
--- a/templates/ro/archtoc.html
+++ b/templates/ro/archtoc.html
@@ -2,7 +2,7 @@
 <HTML>
   <HEAD>
      <title>Arhivele listei %(listname)s</title>
-     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
      <META NAME="robots" CONTENT="noindex,follow">
      %(meta)s
   </HEAD>
diff --git a/templates/ro/article.html b/templates/ro/article.html
index 2e80e439..2dc68a25 100644
--- a/templates/ro/article.html
+++ b/templates/ro/article.html
@@ -5,7 +5,7 @@
    <LINK REL="Index" HREF="index.html" >
    <LINK REL="made" HREF="mailto:%(email_url)s?Subject=%(subject_url)s&In-Reply-To=%(in_reply_to_url)s">
    <META NAME="robots" CONTENT="index,nofollow">
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
    <style type="text/css">
        pre {
            white-space: pre-wrap;       /* css-2.1, curent FF, Opera, Safari */
diff --git a/templates/ro/emptyarchive.html b/templates/ro/emptyarchive.html
index 10eee73b..f9f1f2b5 100644
--- a/templates/ro/emptyarchive.html
+++ b/templates/ro/emptyarchive.html
@@ -3,7 +3,7 @@
   <HEAD>
      <title>Arhivele %(listname)s</title>
      <META NAME="robots" CONTENT="noindex,follow">
-     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
   </HEAD>
   <BODY BGCOLOR="#ffffff">
      <h1>Arhivele %(listname)s</h1>
diff --git a/templates/ro/listinfo.html b/templates/ro/listinfo.html
index d1bf2acc..8ca14a4a 100644
--- a/templates/ro/listinfo.html
+++ b/templates/ro/listinfo.html
@@ -3,7 +3,7 @@
 <HTML>
   <HEAD>
     <TITLE><MM-List-Name> - Informaţii Generale</TITLE>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
   </HEAD>
   <BODY BGCOLOR="#ffffff">
     <P>
diff --git a/templates/ro/options.html b/templates/ro/options.html
index 30abdf04..d29fa239 100644
--- a/templates/ro/options.html
+++ b/templates/ro/options.html
@@ -3,7 +3,7 @@
 <head>
     <link rel="SHORTCUT ICON" href="<mm-favicon>">
     <title>Configurarea abonamentului <MM-Presentable-User> la lista <MM-List-Name></title>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 </head>
 <BODY BGCOLOR="#ffffff">
     <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
diff --git a/templates/ro/private.html b/templates/ro/private.html
index 78521bc0..74126bd4 100755
--- a/templates/ro/private.html
+++ b/templates/ro/private.html
@@ -1,7 +1,7 @@
 <html>
 <head>
     <title>Autentificare la arhivele private %(realname)s</title>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
     <script>function sf(){document.f.username.focus();}</script>
 </head>
 <body bgcolor="#ffffff" onLoad="sf()">
diff --git a/templates/ro/roster.html b/templates/ro/roster.html
index 1aeaed8e..9f1b6d8d 100644
--- a/templates/ro/roster.html
+++ b/templates/ro/roster.html
@@ -2,7 +2,7 @@
 <HTML>
   <HEAD>
     <TITLE>Abonaţii listei <MM-List-Name></TITLE>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
   </HEAD>
   <BODY BGCOLOR="#ffffff">
     <P>
diff --git a/templates/ro/subscribe.html b/templates/ro/subscribe.html
index 9b1cb442..a23e21dc 100644
--- a/templates/ro/subscribe.html
+++ b/templates/ro/subscribe.html
@@ -1,7 +1,7 @@
 <!-- $Revizia: 2.1 $ -->
 <html>
 <head><title>Rezultatele abonării la <MM-List-Name></title></head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-2">
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
 <body bgcolor="white">
 <h1>Rezultatele abonării la <MM-List-Name></h1>
 <MM-Results>