diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-04-03 18:35:52 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-04-03 18:35:52 -0500 |
| commit | 5d6840a0107448550437ce2360dfc905797e47a7 (patch) | |
| tree | ea7b9d4450822c5ccb4a7097767e52e4e65fe34b /mediagoblin/util.py | |
| parent | 58dec5efe56d8affd7aa60f5d01a3c7f3d4fcbb4 (diff) | |
| download | mediagoblin-5d6840a0107448550437ce2360dfc905797e47a7.tar.lz mediagoblin-5d6840a0107448550437ce2360dfc905797e47a7.tar.xz mediagoblin-5d6840a0107448550437ce2360dfc905797e47a7.zip | |
We should always have a request.user object, even if None.
Diffstat (limited to 'mediagoblin/util.py')
| -rw-r--r-- | mediagoblin/util.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py index 5a56d432..fe77a0d9 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -36,12 +36,12 @@ def setup_user_in_request(request): if not request.session.has_key('user_id'): return + user = None + try: user = request.db.User.one({'_id': request.session['user_id']}) - if user: - request.user = user - else: + if not user: # Something's wrong... this user doesn't exist? Invalidate # this session. request.session.invalidate() @@ -50,3 +50,5 @@ def setup_user_in_request(request): # Something's wrong... we shouldn't have multiple users with # the same user id. Invalidate this session. request.session.invalidate() + + request.user = user |