From 89ea2e2b367a1de04408c98e06e73766b2b8e4a7 Mon Sep 17 00:00:00 2001
From: Alexander Burdeinyi <bonus05@gmail.com>
Date: Tue, 27 Dec 2016 13:57:52 +0200
Subject: [PATCH] m

---
 emencia/django/newsletter/forms.py  | 3 ++-
 emencia/django/newsletter/mailer.py | 3 +++
 events/views.py                     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py
index cae37b70..41a2593e 100644
--- a/emencia/django/newsletter/forms.py
+++ b/emencia/django/newsletter/forms.py
@@ -224,7 +224,8 @@ class ContactForm(forms.ModelForm):
             self.instance = Contact.objects.get(email__iexact=email)
             return email
         except (Contact.DoesNotExist, ):
-            return email
+            pass
+        return email
 
 
 class ContactSettingsForm(forms.ModelForm):
diff --git a/emencia/django/newsletter/mailer.py b/emencia/django/newsletter/mailer.py
index 85f79411..e4dfae9a 100644
--- a/emencia/django/newsletter/mailer.py
+++ b/emencia/django/newsletter/mailer.py
@@ -332,9 +332,12 @@ class NewsLetterSender(object):
         return message_attachment
 
     def gen_attachment_logo(self, obj=None, prefix='logo_', resize=None, logo=None, **kwargs):
+        logo_path = None
         if obj is not None:
             if prefix == 'blog':
                 logo = obj.get_blog_preview2()
+                if logo:
+                    logo_path = logo.logo_path
             else:
                 logo = getattr(obj, 'logo')
         if not logo:
diff --git a/events/views.py b/events/views.py
index 5768b162..c18430c8 100644
--- a/events/views.py
+++ b/events/views.py
@@ -122,7 +122,7 @@ class SubscribeView(FormView):
         try:
             contact = Contact.objects.filter(Q(user=user) | Q(email=user.email))[0]
         except (Contact.DoesNotExist, IndexError):
-            contact = Contact(defaults)
+            contact = Contact(**defaults)
             contact.save()
         return contact