From b837bbdd8bf1edd5f93edbd0504361fb6ae7a794 Mon Sep 17 00:00:00 2001 From: Nicolas Martinelli Date: Fri, 1 Jun 2018 15:07:29 +0200 Subject: [PATCH] [FIX] mass_mailing: unsubscribe if trailing '/' If the `web.base.url` contains a trailing `/`, the replacement of the `/unsubscribe_from_list` link won't work since the string to replace will be `my_url//unsubscribe_from_list` instead of `my_url/unsubscribe_from_list`. Fixes #24731 opw-1848572 --- addons/mass_mailing/models/mail_mail.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py index f4611a3250c..1981dbd6b61 100644 --- a/addons/mass_mailing/models/mail_mail.py +++ b/addons/mass_mailing/models/mail_mail.py @@ -95,6 +95,8 @@ class MailMail(osv.Model): res = super(MailMail, self).send_get_email_dict(cr, uid, ids, partner, context=context) mail = self.browse(cr, uid, ids[0], context=context) base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + if base_url.endswith('/'): + base_url = base_url.rstrip('/') if mail.mailing_id and res.get('body') and res.get('email_to'): emails = tools.email_split(res.get('email_to')[0]) email_to = emails and emails[0] or False