diff --git a/modules/marketing_email/marketing.py b/modules/marketing_email/marketing.py index 2fb5f3641e..92f73a2020 100644 --- a/modules/marketing_email/marketing.py +++ b/modules/marketing_email/marketing.py @@ -151,7 +151,10 @@ class Email(DeactivableMixin, ModelSQL, ModelView): def get_email_subscribe_url(self, url=None): if url is None: url = config.get('marketing', 'email_subscribe_url') - return _add_params(url, token=self.email_token) + if url is not None: + return _add_params(url, token=self.email_token) + else: + return '' @classmethod def subscribe_url(cls, url): @@ -183,7 +186,10 @@ class Email(DeactivableMixin, ModelSQL, ModelView): def get_email_unsubscribe_url(self, url=None): if url is None: url = config.get('marketing', 'email_unsubscribe_url') - return _add_params(url, token=self.email_token) + if url is not None: + return _add_params(url, token=self.email_token) + else: + return '' @classmethod def unsubscribe_url(cls, url): diff --git a/modules/web_user/user.py b/modules/web_user/user.py index bc22c8730a..df6f7cf2b4 100644 --- a/modules/web_user/user.py +++ b/modules/web_user/user.py @@ -245,7 +245,10 @@ class User(avatar_mixin(100), DeactivableMixin, ModelSQL, ModelView): def get_email_validation_url(self, url=None): if url is None: url = config.get('web', 'email_validation_url') - return _add_params(url, token=self.email_token) + if url is not None: + return _add_params(url, token=self.email_token) + else: + return '' @classmethod def validate_email_url(cls, url): @@ -299,8 +302,11 @@ class User(avatar_mixin(100), DeactivableMixin, ModelSQL, ModelView): def get_email_reset_password_url(self, url=None): if url is None: url = config.get('web', 'reset_password_url') - return _add_params( - url, token=self.reset_password_token, email=self.email) + if url is not None: + return _add_params( + url, token=self.reset_password_token, email=self.email) + else: + return '' @classmethod def set_password_url(cls, url, password):