aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-07-14 00:40:16 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-07-14 00:40:16 -0500
commit0d91af09d20791920be287b7f772d8a505efc8d4 (patch)
tree056b5be80286790728d70757c8073bf52443ff2b
parent90e342f90ffc59991e040645938521a0a5ba050d (diff)
downloadmediagoblin-0d91af09d20791920be287b7f772d8a505efc8d4.tar.lz
mediagoblin-0d91af09d20791920be287b7f772d8a505efc8d4.tar.xz
mediagoblin-0d91af09d20791920be287b7f772d8a505efc8d4.zip
Use cleaned_markdown_conversion in both cases in edit/views.py
-rw-r--r--mediagoblin/edit/views.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index fac1f41d..f372fbb9 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -18,13 +18,12 @@
from webob import exc
from mediagoblin import messages
-from mediagoblin.util import render_to_response, redirect, clean_html
+from mediagoblin.util import (
+ render_to_response, redirect, 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
@@ -51,12 +50,9 @@ def edit_media(request, media):
else:
media['title'] = request.POST['title']
media['description'] = request.POST.get('description')
-
- 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()
@@ -102,8 +98,7 @@ def edit_profile(request):
user['url'] = request.POST['url']
user['bio'] = request.POST['bio']
- md = markdown.Markdown(safe_mode = 'escape')
- user['bio_html'] = clean_html(md.convert(user['bio']))
+ user['bio_html'] = cleaned_markdown_conversion(user['bio'])
user.save()