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)