diff --git a/odoo/addons/base/tests/test_mail.py b/odoo/addons/base/tests/test_mail.py index 755b959f573..4913558bc60 100644 --- a/odoo/addons/base/tests/test_mail.py +++ b/odoo/addons/base/tests/test_mail.py @@ -328,13 +328,21 @@ class TestHtmlTools(BaseCase): for content in void_strings_samples: self.assertTrue(is_html_empty(content)) - void_html_samples = ['


', '


', '


', '

', - '
', '


'] + void_html_samples = [ + '


', '


', '


', + '

', + '
', + '


', + '


', + ] for content in void_html_samples: self.assertTrue(is_html_empty(content), 'Failed with %s' % content) - valid_html_samples = ['


1

', '

1

', '

Hello World

', - '

Hello World

'] + valid_html_samples = [ + '


1

', '

1

', '

Hello World

', + '

Hello World

', + '

W

', + ] for content in valid_html_samples: self.assertFalse(is_html_empty(content)) diff --git a/odoo/tools/mail.py b/odoo/tools/mail.py index 792bb1e876b..ecda726a23f 100644 --- a/odoo/tools/mail.py +++ b/odoo/tools/mail.py @@ -280,7 +280,7 @@ def is_html_empty(html_content): """ if not html_content: return True - tag_re = re.compile(r'\<\s*\/?(?:p|div|span|br|b|i)(?:(?=\s+\w*)[^/>]*|\s*)/?\s*\>') + tag_re = re.compile(r'\<\s*\/?(?:p|div|span|br|b|i|font)(?:(?=\s+\w*)[^/>]*|\s*)/?\s*\>') return not bool(re.sub(tag_re, '', html_content).strip())