Merge lp:~openerp-dev/openobject-server/saas-3-opw-605315-acl into lp:~openerp/openobject-server/saas-3
Proposed by
Anaël Closson (openerp)
Status: | Merged |
---|---|
Merged at revision: | 5117 |
Proposed branch: | lp:~openerp-dev/openobject-server/saas-3-opw-605315-acl |
Merge into: | lp:~openerp/openobject-server/saas-3 |
Diff against target: |
43 lines (+8/-2) 1 file modified
openerp/tools/mail.py (+8/-2) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-server/saas-3-opw-605315-acl |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Trigaux (OpenERP) (community) | Approve | ||
Review via email: mp+215889@code.launchpad.net |
Description of the change
The html editor modifies mako instruction not inside html tags.
This keep modifies html sanitisation so that
- comments are kept in the sanitisation process
- they are considered as inside html tags by the html editor, hence not modified
This is particularly needed when a template generates rows in a html table, the processing instructions should be added around "<tr></tr>". Any modifications in the template before sending the e-mail break it.
To post a comment you must log in.
LGMT, merged in saas-3
revno: 5117 [merge]
revision-id: <email address hidden>