Commits

Michael Kerrin committed ce0a62c

Fix contenttype on uploaded content

Comments (0)

Files changed (1)

MoinMoin/items/__init__.py

             meta = {}
 
         if contenttype_qs:
-            # we use querystring param to FORCE content type
-            meta[CONTENTTYPE] = contenttype_qs
+            # we use querystring param to FORCE content type, unless we
+            # have uploaded a document in which case we use the document value
+            if data and contenttype_guessed:
+                meta[CONTENTTYPE] = contenttype_guessed.decode("utf-8")
+            else:
+                meta[CONTENTTYPE] = contenttype_qs
 
         comment = request.form.get('comment')
         return self._save(meta, data, contenttype_guessed=contenttype_guessed, comment=comment)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.