odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mass_mailing: use werkzeug url_encode instead of urllib urlencode 

As Werkzeug support UTF-8 unicoding, while urllib doesn't
This commit is contained in:
Denis Ledoux 2015-08-11 13:04:43 +02:00
parent e232221514
commit 0d3a9c47e7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/mass_mailing/models/mail_mail.py
View File

@ -19,8 +19,8 @@
#
##############################################################################
import urllib
import urlparse
import werkzeug.urls
from openerp import tools
from openerp import SUPERUSER_ID
@ -55,7 +55,7 @@ class MailMail(osv.Model):
track_url = urlparse.urljoin(
base_url, 'mail/track/%(mail_id)s/blank.gif?%(params)s' % {
'mail_id': mail.id,
'params': urllib.urlencode({'db': cr.dbname})
'params': werkzeug.url_encode({'db': cr.dbname})
}
)
return '<img src="%s" alt=""/>' % track_url
@ -65,7 +65,7 @@ class MailMail(osv.Model):
url = urlparse.urljoin(
base_url, 'mail/mailing/%(mailing_id)s/unsubscribe?%(params)s' % {
'mailing_id': mail.mailing_id.id,
'params': urllib.urlencode({'db': cr.dbname, 'res_id': mail.res_id, 'email': email_to})
'params': werkzeug.url_encode({'db': cr.dbname, 'res_id': mail.res_id, 'email': email_to})
}
)
return '<small><a href="%s">%s</a></small>' % (url, msg or 'Click to unsubscribe')