From: lora <lorochka85@gmail.com>
Date: Sat, 19 Nov 2011 23:01:40 +0000 (-0600)
Subject: Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=707001950a42c7adfd6657f227a2c2dbbd09afce;p=mediagoblin.git

Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
---

707001950a42c7adfd6657f227a2c2dbbd09afce
diff --cc mediagoblin/decorators.py
index 38f52ced,8f7532ec..9cac1cfa
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@@ -58,9 -58,9 +58,9 @@@ def user_may_delete_media(controller)
      """
      def wrapper(request, *args, **kwargs):
          uploader = request.db.MediaEntry.find_one(
 -            {'_id': ObjectId(request.matchdict['media'])}).uploader()
 +            {'slug': request.matchdict['media'] }).uploader()
          if not (request.user['is_admin'] or
-                 request.user['_id'] == uploader['_id']):
+                 request.user._id == uploader._id):
              return exc.HTTPForbidden()
  
          return controller(request, *args, **kwargs)