From 3bd62dc4ca4fb12c772729bbb9dd6a78c3c08e48 Mon Sep 17 00:00:00 2001 From: Emily O'Leary Date: Tue, 6 Aug 2013 18:22:51 -0400 Subject: Changed how the comment was encoded/read. Fixed CSRF + Post with comment preview. Merged with latest master --- mediagoblin/user_pages/views.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'mediagoblin/user_pages/views.py') diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 2bc56fd5..2e613697 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -17,7 +17,6 @@ import logging import datetime import json -import urllib from mediagoblin import messages, mg_globals from mediagoblin.db.models import (MediaEntry, MediaTag, Collection, @@ -199,15 +198,11 @@ def media_post_comment(request, media): def media_preview_comment(request): + """Runs a comment through markdown so it can be previewed.""" + comment = unicode(request.form['comment_content']) + cleancomment = { "content":cleaned_markdown_conversion(comment)} - comment = unicode(urllib.unquote(request.query_string).decode('string_escape')) - if comment.startswith('"') and comment.endswith('"'): - comment = comment[1:-1] - print comment - #decoderRing = json.JSONDecoder() - #comment = decoderRing.decode(request.query_string) - - return Response(json.dumps(cleaned_markdown_conversion(comment))) + return Response(json.dumps(cleancomment)) @get_media_entry_by_id @require_active_login -- cgit v1.2.3