From eac73e3dd46082a0328f6c9bc249a0534606efb8 Mon Sep 17 00:00:00 2001
From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Wed, 5 May 2010 12:15:26 +0200
Subject: [PATCH] Fixed a few bugs.

---
 flask_website/openid_auth.py               | 6 +++---
 flask_website/templates/general/login.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flask_website/openid_auth.py b/flask_website/openid_auth.py
index 47a3a0df..427973b5 100644
--- a/flask_website/openid_auth.py
+++ b/flask_website/openid_auth.py
@@ -46,7 +46,7 @@ class WebsiteOpenIDStore(OpenIDStore):
         return result_assoc
 
     def removeAssociation(self, server_url, handle):
-        return OpenIDAssociation.filter(
+        return OpenIDAssociation.query.filter(
             (OpenIDAssociation.server_url == server_url) &
             (OpenIDAssociation.handle == handle)
         ).delete()
@@ -67,12 +67,12 @@ class WebsiteOpenIDStore(OpenIDStore):
         return True
 
     def cleanupNonces(self):
-        return OpenIDUserNonce.filter(
+        return OpenIDUserNonce.query.filter(
             OpenIDUserNonce.timestamp <= int(time() - nonce.SKEW)
         ).delete()
 
     def cleanupAssociations(self):
-        return OpenIDAssociation.filter(
+        return OpenIDAssociation.query.filter(
             OpenIDAssociation.lifetime < int(time())
         ).delete()
 
diff --git a/flask_website/templates/general/login.html b/flask_website/templates/general/login.html
index 1234327e..7b34f771 100644
--- a/flask_website/templates/general/login.html
+++ b/flask_website/templates/general/login.html
@@ -16,7 +16,7 @@
     <p>
       OpenID URL:
       <input type=text name=openid class=openid size=30>
-      <input type=hidden name=next value="{{ request.values.next or request.referrer }}">
+      <input type=hidden name=next value="{{ request.values.next or request.referrer or url_for('general.index') }}">
       <input type=submit value=Login>
   </form>
 {% endblock %}