X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0dba53c0232385f0fd080266f9a5ce3665426293..f8ace8f9e063861d66558f43b936c92ae85a0e96:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 80dad87b5..b52bcefef 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
-  has_many :active_blocks, :class_name => "UserBlock", :conditions => ['user_blocks.ends_at > \'#{Time.now.getutc.xmlschema(5)}\' or user_blocks.needs_view']
+  has_many :active_blocks, :class_name => "UserBlock", :conditions => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] }
   has_many :roles, :class_name => "UserRole"
 
   validates_presence_of :email, :display_name