From: Rodney Ewing <ewing.rj@gmail.com>
Date: Tue, 4 Jun 2013 18:26:34 +0000 (-0700)
Subject: fixed a bug that was deleting the messages
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8ce8faaf5d302574cb0144cc683470a940119a46;hp=1bce0c15ba97995ba7772296ab698b36a7dc41ca;p=mediagoblin.git

fixed a bug that was deleting the messages
---

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index ecd3de0e..575a3835 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -192,11 +192,11 @@ class MediaGoblinApp(object):
 
         request.urlgen = build_proxy
 
-        mg_request.setup_user_in_request(request)
-
         # Log user out if in no_auth mode
         no_auth_logout(request)
 
+        mg_request.setup_user_in_request(request)
+
         request.controller_name = None
         try:
             found_rule, url_values = map_adapter.match(return_rule=True)
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index 22da54d0..ae0b79da 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -202,6 +202,7 @@ def check_auth_enabled():
 
 
 def no_auth_logout(request):
-    """Log out the user if in no_auth mode"""
-    if not mg_globals.app.auth:
-        request.session.delete()
+    """Log out the user if in no_auth mode, but don't delete the messages"""
+    if not mg_globals.app.auth and 'user_id' in request.session:
+        del request.session['user_id']
+        request.session.save()