Use cleaned_markdown_conversion in both cases in edit/views.py

This commit is contained in:
Christopher Allan Webber 2011-07-14 00:40:16 -05:00
parent 90e342f90f
commit 0d91af09d2

View File

@ -18,13 +18,12 @@
from webob import exc from webob import exc
from mediagoblin import messages 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 import forms
from mediagoblin.edit.lib import may_edit_media from mediagoblin.edit.lib import may_edit_media
from mediagoblin.decorators import require_active_login, get_user_media_entry from mediagoblin.decorators import require_active_login, get_user_media_entry
import markdown
@get_user_media_entry @get_user_media_entry
@require_active_login @require_active_login
@ -51,12 +50,9 @@ def edit_media(request, media):
else: else:
media['title'] = request.POST['title'] media['title'] = request.POST['title']
media['description'] = request.POST.get('description') media['description'] = request.POST.get('description')
md = markdown.Markdown( media['description_html'] = cleaned_markdown_conversion(
safe_mode = 'escape') media['description'])
media['description_html'] = clean_html(
md.convert(
media['description']))
media['slug'] = request.POST['slug'] media['slug'] = request.POST['slug']
media.save() media.save()
@ -102,8 +98,7 @@ def edit_profile(request):
user['url'] = request.POST['url'] user['url'] = request.POST['url']
user['bio'] = request.POST['bio'] user['bio'] = request.POST['bio']
md = markdown.Markdown(safe_mode = 'escape') user['bio_html'] = cleaned_markdown_conversion(user['bio'])
user['bio_html'] = clean_html(md.convert(user['bio']))
user.save() user.save()