Report duplicate OpenID URLs cleanly

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 83ee16f53fe23fefcc0e49636e0d96764c7750fa..d0a357c85c8258436acbc826f8995580f3e43762 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -255,7 +255,7 @@ class ChangesetController < ApplicationController
     conditions = conditions_nonempty
 
     if params[:display_name]
-      user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
+      user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
 
       if user 
         if user.data_public? or user == @user
@@ -427,7 +427,7 @@ private
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(closed)
-    return closed.nil? ? nil : ['closed_at < ? and num_changes > ?', 
+    return closed.nil? ? nil : ['closed_at < ? or num_changes > ?', 
                                 Time.now.getutc, Changeset::MAX_ELEMENTS]
   end