From 9ce44321cfe55d8e46a074b868ae7368d47ebb15 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 21 May 2017 20:07:54 +0200 Subject: [PATCH] plugin invitations: doesn't raise an exception anymore if url_template is not set while email is not requested --- src/plugins/plugin_misc_invitations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/plugin_misc_invitations.py b/src/plugins/plugin_misc_invitations.py index c661d292..147646a4 100644 --- a/src/plugins/plugin_misc_invitations.py +++ b/src/plugins/plugin_misc_invitations.py @@ -165,7 +165,9 @@ class InvitationsPlugin(object): self.checkExtra(extra) - if not 'url_template' in kwargs and not 'message_body' in kwargs: + email = kwargs.pop(u'email', None) + + if email is not None and not 'url_template' in kwargs and not 'message_body' in kwargs: raise ValueError(_(u"You need to provide url_template if you use default message body")) @@ -229,7 +231,6 @@ class InvitationsPlugin(object): language = kwargs.pop(u'language', None) if language is not None: extra[u'language'] = language - email = kwargs.pop(u'email', None) if email is not None: extra[u'email'] = email