Merge remote branch 'remotes/jwandborg/issue_363'

Conflicts:
	setup.py

1 files changed, 10 insertions, 1 deletions

diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index e9b5c37e..437a5a51 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -19,11 +19,13 @@ from cgi import FieldStorage
 
 from werkzeug.utils import secure_filename
 
-from mediagoblin.util import render_to_response, redirect
+from mediagoblin.util import render_to_response, redirect, clean_html
 from mediagoblin.decorators import require_active_login
 from mediagoblin.submit import forms as submit_forms, security
 from mediagoblin.process_media import process_media_initial
 
+import markdown
+
 
 @require_active_login
 def submit_start(request):
@@ -48,6 +50,13 @@ def submit_start(request):
             entry = request.db.MediaEntry()
             entry['title'] = request.POST['title'] or unicode(splitext(filename)[0])
             entry['description'] = request.POST.get('description')
+            
+            md = markdown.Markdown(
+                safe_mode = 'escape')
+            entry['description_html'] = clean_html(
+                md.convert(
+                    entry['description']))
+            
             entry['media_type'] = u'image' # heh
             entry['uploader'] = request.user['_id']