From eb6a2cf42f36f34991fa89f4c7400bb4729c28f5 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 16 Jul 2014 23:43:37 +0530 Subject: [PATCH] fix wrong filename in email attachment, frappe/erpnext#1947 --- frappe/utils/email_lib/email_body.py | 2 +- frappe/utils/file_manager.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/utils/email_lib/email_body.py b/frappe/utils/email_lib/email_body.py index 12e94b5f3a..ba7057003e 100644 --- a/frappe/utils/email_lib/email_body.py +++ b/frappe/utils/email_lib/email_body.py @@ -142,7 +142,7 @@ class EMail: # Set the filename parameter if fname: part.add_header(b'Content-Disposition', - ("attachment; filename=%s" % fname).encode('utf-8')) + ("attachment; filename=\"%s\"" % fname).encode('utf-8')) self.msg_root.attach(part) diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index bde7154259..6bdc3af4a4 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -208,11 +208,13 @@ def get_file(fname): else: file_name = fname - if not "/" in file_name: - file_name = "files/" + file_name + file_path = file_name + + if not "/" in file_path: + file_path = "files/" + file_path # read the file - with open(get_site_path("public", file_name), 'r') as f: + with open(get_site_path("public", file_path), 'r') as f: content = f.read() return [file_name, content]