diff --git a/VERSION b/VERSION index cb32ad35..087aea73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2012-02-04 09:51:12) stable +Version 1.99.4 (2012-02-04 10:07:28) stable diff --git a/gluon/tools.py b/gluon/tools.py index 78fa1a5b..2216e0ff 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1470,7 +1470,7 @@ class Auth(object): checks.append(fieldname) user = user or table_user(**{fieldname:keys[fieldname]}) # if we think we found the user but registration_id does not match, make new user - if user and user.registration_id and user.registration_id!=keys.get('registration_id',None): + if 'registration_id' in checks and user and user.registration_id and user.registration_id!=keys.get('registration_id',None): user = None # THINK MORE ABOUT THIS? DO WE TRUST OPENID PROVIDER? keys['registration_key']='' if user: