Wiking branch, master, updated. 7596790be65eac02bf34b67b3febb73ac497af5c

[Milan Zamazal]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  7596790be65eac02bf34b67b3febb73ac497af5c (commit)
      from  c510a03d94f12163f4250f32df62731e45b9d244 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7596790be65eac02bf34b67b3febb73ac497af5c
Author: Milan Zamazal <pdm at brailcom.org>
Date:   Fri Oct 22 09:46:13 2010 +0200

    Fix of crash on empty role in Users.find_users

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/users.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lib/wiking/cms/users.py b/lib/wiking/cms/users.py
index da7150e..df44dca 100644
--- a/lib/wiking/cms/users.py
+++ b/lib/wiking/cms/users.py
@@ -1087,7 +1087,11 @@ class Users(UserManagementModule):
         If all the criteria arguments are 'None', all users are returned.
 
         """
-        key = (email, state, role.id(), confirm,)
+        if role is None:
+            role_id = None
+        else:
+            role_id = role.id()
+        key = (email, state, role_id, confirm,)
         user_cache = self._find_users_cache.get(req)
         if user_cache is None:
             user_cache = self._find_users_cache[req] = {}


hooks/post-receive
-- 
Wiking