Merge pull request #2 from SimonKern/master

Media path issue in extensions/webmail/lib.py
This commit is contained in:
Antoine Nguyen
2013-05-09 06:37:23 -07:00
+3 -3
View File
@@ -291,9 +291,9 @@ class ImapEmail(Email):
for cid, params in self.bs.inlines.iteritems():
if re.search("\.\.", cid):
continue
fname = "media/webmail/%s_%s" % (self.mailid, cid)
path = os.path.join(settings.MODOBOA_DIR, fname)
params["fname"] = "/%s" % fname
fname = "webmail/%s_%s" % (self.mailid, cid)
path = os.path.join(settings.MEDIA_ROOT, fname)
params["fname"] = settings.MEDIA_URL+"/%s" % fname
if os.path.exists(path):
continue