aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/decorators.py
diff options
context:
space:
mode:
authorJessica Tallon <jessica@megworld.co.uk>2014-12-02 14:50:35 +0000
committerJessica Tallon <jessica@megworld.co.uk>2014-12-02 14:51:24 +0000
commit5436d980a104b5c20264f44ab9ae881250bdf1b0 (patch)
treef9082fac18403f657103e9ab11f31f64bb660343 /mediagoblin/decorators.py
parent6740d034223f50cb74869f6e14b4b5a8dd059638 (diff)
downloadmediagoblin-5436d980a104b5c20264f44ab9ae881250bdf1b0.tar.lz
mediagoblin-5436d980a104b5c20264f44ab9ae881250bdf1b0.tar.xz
mediagoblin-5436d980a104b5c20264f44ab9ae881250bdf1b0.zip
Fix #1024 - Correctly set generator on Activities
Diffstat (limited to 'mediagoblin/decorators.py')
-rw-r--r--mediagoblin/decorators.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index f3be679d..eab09ec3 100644
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -419,9 +419,9 @@ def oauth_required(controller):
# Fill user if not already
token = authorization[u"oauth_token"]
- access_token = AccessToken.query.filter_by(token=token).first()
- if access_token is not None and request.user is None:
- user_id = access_token.user
+ request.access_token = AccessToken.query.filter_by(token=token).first()
+ if request.access_token is not None and request.user is None:
+ user_id = request.access_token.user
request.user = User.query.filter_by(id=user_id).first()
return controller(request, *args, **kwargs)