From: Richard Fairhurst Date: Mon, 11 Jun 2007 14:43:06 +0000 (+0000) Subject: remove timeout X-Git-Tag: live~8425 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5ef2e8f6616a6e6e931cfe760cffd2228a78ed20?ds=sidebyside remove timeout --- diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index c5a7c30ea..7b2cba701 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -555,9 +555,9 @@ end def getuserid(token) token=sqlescape(token) if (token=~/^(.+)\+(.+)$/) then - return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND timeout>NOW() AND email='#{$1}' AND pass_crypt=MD5('#{$2}')") + return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND email='#{$1}' AND pass_crypt=MD5('#{$2}')") else - return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND timeout>NOW() AND token='#{token}'") + return ActiveRecord::Base.connection.select_value("SELECT id FROM users WHERE active=1 AND token='#{token}'") end end