tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Do not try to add parameters to empty URL

Browse Source 
Closes #14505
(grafted from a014cc36dac8a16f6c3ebd2450f1ba930a7f614f)

--HG--
branch : 6.0
This commit is contained in:
Cédric Krier
2026-01-19 12:30:41 +01:00
parent 08ad05d005
commit fdfacce7bf
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/marketing_email/marketing.py
+8 -2
View File
@@ -161,7 +161,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):
@@ -193,7 +196,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):
modules/web_user/user.py
+9 -3
View File
@@ -297,7 +297,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):
@@ -351,8 +354,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):