diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-21 17:43:05 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-02-21 17:43:05 +0100 |
| commit | aa8804719c7930181aa7a0af41ca5b983fdf5be4 (patch) | |
| tree | ba3f8a30d3b72e6b29bdd71823df2c33d4bb2b27 /mediagoblin/user_pages/views.py | |
| parent | 6c2e57304c302acfc005686515ce91d91727dd8d (diff) | |
| parent | 99812bbc4a76735824708b341ea283f09a1b423c (diff) | |
| download | mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.tar.lz mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.tar.xz mediagoblin-aa8804719c7930181aa7a0af41ca5b983fdf5be4.zip | |
Resolve merge conflicts
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 82791278..05d07b1b 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -18,7 +18,6 @@ from webob import exc from mediagoblin import messages, mg_globals from mediagoblin.db.util import DESCENDING, ObjectId -from mediagoblin.tools.text import cleaned_markdown_conversion from mediagoblin.tools.response import render_to_response, render_404, redirect from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.pagination import Pagination @@ -146,7 +145,6 @@ def media_post_comment(request, media): comment['media_entry'] = media._id comment['author'] = request.user._id comment['content'] = unicode(request.POST['comment_content']) - comment['content_html'] = cleaned_markdown_conversion(comment['content']) if not comment['content'].strip(): messages.add_message( @@ -250,7 +248,7 @@ def atom_feed(request): for entry in cursor: feed.add(entry.get('title'), - entry.get('description_html'), + entry.description_html, id=entry.url_for_self(request.urlgen,qualified=True), content_type='html', author={ |