[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:
parent
e232221514
commit
0d3a9c47e7
|
@ -19,8 +19,8 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import urllib
|
|
||||||
import urlparse
|
import urlparse
|
||||||
|
import werkzeug.urls
|
||||||
|
|
||||||
from openerp import tools
|
from openerp import tools
|
||||||
from openerp import SUPERUSER_ID
|
from openerp import SUPERUSER_ID
|
||||||
|
@ -55,7 +55,7 @@ class MailMail(osv.Model):
|
||||||
track_url = urlparse.urljoin(
|
track_url = urlparse.urljoin(
|
||||||
base_url, 'mail/track/%(mail_id)s/blank.gif?%(params)s' % {
|
base_url, 'mail/track/%(mail_id)s/blank.gif?%(params)s' % {
|
||||||
'mail_id': mail.id,
|
'mail_id': mail.id,
|
||||||
'params': urllib.urlencode({'db': cr.dbname})
|
'params': werkzeug.url_encode({'db': cr.dbname})
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
return '<img src="%s" alt=""/>' % track_url
|
return '<img src="%s" alt=""/>' % track_url
|
||||||
|
@ -65,7 +65,7 @@ class MailMail(osv.Model):
|
||||||
url = urlparse.urljoin(
|
url = urlparse.urljoin(
|
||||||
base_url, 'mail/mailing/%(mailing_id)s/unsubscribe?%(params)s' % {
|
base_url, 'mail/mailing/%(mailing_id)s/unsubscribe?%(params)s' % {
|
||||||
'mailing_id': mail.mailing_id.id,
|
'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')
|
return '<small><a href="%s">%s</a></small>' % (url, msg or 'Click to unsubscribe')
|
||||||
|
|
Loading…
Reference in New Issue