Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags

[mediagoblin.git] / mediagoblin / edit / views.py

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index e4ebe8d797ee47b4f963edbe811c124765c28ca1..5cbaadb5e52cf68482b9ab1641aa3e85e1c59e04 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -22,13 +22,11 @@ from mediagoblin import messages
 from mediagoblin import mg_globals
 from mediagoblin.util import (
     render_to_response, redirect, clean_html, convert_to_tag_list_of_dicts,
-    media_tags_as_string)
+    media_tags_as_string, cleaned_markdown_conversion)
 from mediagoblin.edit import forms
 from mediagoblin.edit.lib import may_edit_media
 from mediagoblin.decorators import require_active_login, get_user_media_entry
 
-import markdown
-
 
 @get_user_media_entry
 @require_active_login
@@ -59,11 +57,8 @@ def edit_media(request, media):
             media['tags'] = convert_to_tag_list_of_dicts(
                                    request.POST.get('tags'))
             
-            md = markdown.Markdown(
-                safe_mode = 'escape')
-            media['description_html'] = clean_html(
-                md.convert(
-                    media['description']))
+            media['description_html'] = cleaned_markdown_conversion(
+                media['description'])
 
             media['slug'] = request.POST['slug']
             media.save()
@@ -108,6 +103,9 @@ def edit_profile(request):
     if request.method == 'POST' and form.validate():
             user['url'] = request.POST['url']
             user['bio'] = request.POST['bio']
+
+            user['bio_html'] = cleaned_markdown_conversion(user['bio'])
+
             user.save()
 
             messages.add_message(request, 
@@ -115,7 +113,7 @@ def edit_profile(request):
                                 'Profile edited!')
             return redirect(request,
                            'mediagoblin.user_pages.user_home',
-                           username=edit_username)
+                           user=edit_username)
 
     return render_to_response(
         request,