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/submit/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/submit/views.py')
| -rw-r--r-- | mediagoblin/submit/views.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index cdd097ec..845400ca 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -28,7 +28,7 @@ _log = logging.getLogger(__name__) from werkzeug.utils import secure_filename from mediagoblin.db.util import ObjectId -from mediagoblin.tools.text import cleaned_markdown_conversion, convert_to_tag_list_of_dicts +from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.translate import pass_to_ugettext as _ from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.decorators import require_active_login @@ -66,8 +66,6 @@ def submit_start(request): or unicode(splitext(filename)[0])) entry.description = unicode(request.POST.get('description')) - entry.description_html = cleaned_markdown_conversion( - entry.description) entry.license = unicode(request.POST.get('license', "")) or None |