[MERGE] forward port branch 9.0 up to f750393

noahd1 · Aug 21, 2018 · 342d037 · 342d037
2 parents cc72b0c + f750393
commit 342d037
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
@@ -86,7 +86,9 @@ def send_forum_validation_email(self, forum_id=None):
                 params['forum_id'] = forum_id
             base_url = self.env['ir.config_parameter'].get_param('web.base.url')
             token_url = base_url + '/forum/validate_email?%s' % urlencode(params)
-            activation_template.sudo().with_context(token_url=token_url).send_mail(self.id, force_send=True)
+            with self._cr.savepoint():
+                activation_template.sudo().with_context(token_url=token_url).send_mail(
+                    self.id, force_send=True, raise_exception=True)
         return True
 
     @api.one