[MERGE] forward port branch 11.0 up to 5a943390f2

2018-05-15 20:18:14 +02:00
parent 05ef2f24e0 5a943390f2
commit fa8a67ee5f
17 changed files with 74 additions and 26 deletions
@@ -1116,7 +1116,7 @@ class Binary(http.Controller):
            if request.httprequest.user_agent.browser == 'safari':
                # Safari sends NFD UTF-8 (where é is composed by 'e' and [accent])
                # we need to send it the same stuff, otherwise it'll fail
-                filename = unicodedata.normalize('NFD', ufile.filename).encode('UTF-8')
+                filename = unicodedata.normalize('NFD', ufile.filename)

            try:
                attachment = Model.create({