diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 20:19:16 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 20:19:16 -0500 |
| commit | e39feb041b079af53af093050f97d741e40851e7 (patch) | |
| tree | a41efd22c008bf5f439033228c92e61afd85355d /mediagoblin/user_pages/views.py | |
| parent | 829f5f9371b033a689067caffa91a03989006ce1 (diff) | |
| parent | 94fadafe0908e497b9562f6e2689d83d07c5147d (diff) | |
| download | mediagoblin-e39feb041b079af53af093050f97d741e40851e7.tar.lz mediagoblin-e39feb041b079af53af093050f97d741e40851e7.tar.xz mediagoblin-e39feb041b079af53af093050f97d741e40851e7.zip | |
Merge branch 'master' into 623_context_hooks
Diffstat (limited to 'mediagoblin/user_pages/views.py')
| -rw-r--r-- | mediagoblin/user_pages/views.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 52745be2..738cc054 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -161,7 +161,13 @@ def media_post_comment(request, media): comment.author = request.user.id comment.content = unicode(request.form['comment_content']) - if not comment.content.strip(): + # Show error message if commenting is disabled. + if not mg_globals.app_config['allow_comments']: + messages.add_message( + request, + messages.ERROR, + _("Sorry, comments are disabled.")) + elif not comment.content.strip(): messages.add_message( request, messages.ERROR, |