aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-04-19 19:16:56 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-04-19 19:16:56 -0500
commitddff7cce3e480f938d4d69b8d9e55e8dcf4bd562 (patch)
tree2d6385f16fbbf5eeb628dc29c050d308606763e2 /mediagoblin/app.py
parent6648c52ba8c186d469fb9d1102d2c11f0518011e (diff)
downloadmediagoblin-ddff7cce3e480f938d4d69b8d9e55e8dcf4bd562.tar.lz
mediagoblin-ddff7cce3e480f938d4d69b8d9e55e8dcf4bd562.tar.xz
mediagoblin-ddff7cce3e480f938d4d69b8d9e55e8dcf4bd562.zip
util.setup_user_in_request must be called last
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 0157748c..ae6db8f7 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -85,7 +85,6 @@ class MediaGoblinApp(object):
request.urlgen = routes.URLGenerator(self.routing, environ)
# Do we really want to load this via middleware? Maybe?
request.session = request.environ['beaker.session']
- util.setup_user_in_request(request)
# Attach self as request.app
# Also attach a few utilities from request.app for convenience?
request.app = self
@@ -93,6 +92,8 @@ class MediaGoblinApp(object):
request.db = self.db
request.staticdirect = self.staticdirector
+ util.setup_user_in_request(request)
+
return controller(request)(environ, start_response)