From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 20 Apr 2011 00:16:56 +0000 (-0500)
Subject: util.setup_user_in_request must be called last
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ddff7cce3e480f938d4d69b8d9e55e8dcf4bd562;p=mediagoblin.git

util.setup_user_in_request must be called last
---

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)