Merge remote-tracking branch 'spaetz/master'

diff --combined mediagoblin/user_pages/views.py
index 5eac0fe4dd036eff2c65c3180354d0f0579d634d,ac39c4ba475ca6202e66487f03e76d867864b7f8..974cb3c6b864641341d535aebf56312bd374ec36
--- 1/mediagoblin/user_pages/views.py
--- 2/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@@ -47,16 -47,13 +47,13 @@@ _log.setLevel(logging.DEBUG
  @uses_pagination
  def user_home(request, page):
      """'Homepage' of a User()"""
-     # TODO: decide if we only want homepages for active users, we can
-     # then use the @get_active_user decorator and also simplify the
-     # template html.
      user = User.query.filter_by(username=request.matchdict['user']).first()
      if not user:
          return render_404(request)
      elif user.status != u'active':
          return render_to_response(
              request,
-             'mediagoblin/user_pages/user.html',
+             'mediagoblin/user_pages/user_nonactive.html',
              {'user': user})
  
      cursor = MediaEntry.query.\
@@@ -296,11 -293,6 +293,11 @@@ def media_confirm_delete(request, media
      if request.method == 'POST' and form.validate():
          if form.confirm.data is True:
              username = media.get_uploader.username
 +
 +            media.get_uploader.uploaded = media.get_uploader.uploaded - \
 +                media.file_size
 +            media.get_uploader.save()
 +
              # Delete MediaEntry and all related files, comments etc.
              media.delete()
              messages.add_message(