Fixed IdentityURL parsing

Minor updates
dim · Mar 1, 2009 · 7ee0d89 · 7ee0d89
1 parent c6ae82f
commit 7ee0d89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/user.rb b/ext/user.rb
@@ -11,7 +11,7 @@
     :if => Proc.new { |user| user.identity_url.present? }
 
   def self.open_id_authenticate(identity_url)
-    identity_url.present? ? find_by_identity_url_and_active(identity_url, true) : nil
+    identity_url.present? ? active.find_by_identity_url(identity_url) : nil
   end
 
   protected

diff --git a/models/open_id/identity_url.rb b/models/open_id/identity_url.rb
@@ -11,7 +11,7 @@ def self.parse(url)
       uri.scheme = uri.scheme.downcase  # URI should do this
       new(uri.normalize.to_s.chomp('/'))
     rescue URI::InvalidURIError
-      nil
+      ''
     end
   end