From 7ff6ea14e2f3ec8607c5c3556c9385927bb2cb06 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Wed, 11 Sep 2013 20:31:12 +0200
Subject: [PATCH] Rewrite fix for UserStore.expert() to be more like
 UserStoreOld.expert().

---
 modules/installed/lib/user_store.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/installed/lib/user_store.py b/modules/installed/lib/user_store.py
index 1512472be..0e7c5ecab 100644
--- a/modules/installed/lib/user_store.py
+++ b/modules/installed/lib/user_store.py
@@ -16,12 +16,21 @@ class UserStore(UserStoreModule, sqlite_db):
     def close(self):
         self.__exit__(None,None,None)
 
-    def currentuser(self):
-        return cherrypy.session.get(cfg.session_key)
-
+    def current(self, name=False):
+        """Return current user, if there is one, else None.
+        If name = True, return the username instead of the user."""
+        try:
+            username = cherrypy.session.get(cfg.session_key)
+            if name:
+                return username
+            else:
+                return self.get(username)
+        except AttributeError:
+            return None
+        
     def expert(self, username=None):
-        if username is None:
-            username = self.currentuser()
+        if not username:
+            username = self.current(name=True)
         groups = self.attr(username,"groups")
         if not groups:
             return False