From d3a927e4e0d8257f35f3e45e59ca9161ce0760f6 Mon Sep 17 00:00:00 2001
From: Giancarlo Razzolini <grazzolini@archlinux.org>
Date: Fri, 25 Oct 2019 14:58:33 -0300
Subject: news: Make the check for MAILMAN_PASSWORD backwards compatible

This makes the check work with previous versions of archweb while also taking into
account downstreams that might not want or need this change.
---
 news/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/news/views.py b/news/views.py
index 20a74c3c..24423cca 100644
--- a/news/views.py
+++ b/news/views.py
@@ -40,13 +40,13 @@ class NewsCreateView(CreateView):
         newsitem.author = self.request.user
         newsitem.slug = find_unique_slug(News, newsitem.title)
         newsitem.save()
-        if newsitem.send_announce and settings.MAILMAN_PASSWORD:
+        if newsitem.send_announce:
             ctx = {
                 'news': newsitem,
             }
-            headers = {
-                'Approved': settings.MAILMAN_PASSWORD,
-            }
+            headers = dict()
+            if settings.MAILMAN_PASSWORD:
+                headers['Approved'] = settings.MAILMAN_PASSWORD
             template = loader.get_template('news/news_email_notification.txt')
             EmailMessage(subject='[arch-announce] %s' % newsitem.title,
                       body=template.render(ctx),
-- 
cgit v1.2.3-55-g3dc8