aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit/views.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-07-13 23:19:46 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-07-13 23:19:46 -0500
commitfb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c (patch)
tree35c9de312486b5543eadf1b50e674f3d787b145c /mediagoblin/edit/views.py
parentc47c37ed953689e70441c4c143e4c06f1645be7d (diff)
parent4c465852d198a1d8e8562a1e25b23fa7c9b4d2b4 (diff)
downloadmediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.tar.lz
mediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.tar.xz
mediagoblin-fb5075e6b2ec5b2b20eecf3b4c9fb62a5253ad5c.zip
Merge remote branch 'remotes/aaronw/feature410_markdown_bio'
Diffstat (limited to 'mediagoblin/edit/views.py')
-rw-r--r--mediagoblin/edit/views.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 3bcf788b..fac1f41d 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -101,6 +101,10 @@ def edit_profile(request):
if request.method == 'POST' and form.validate():
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.save()
messages.add_message(request,