Avoid using string interpolation in conditions
authorTom Hughes <tom@compton.nu>
Tue, 15 Mar 2011 20:39:01 +0000 (20:39 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 14 Nov 2011 09:42:48 +0000 (09:42 +0000)
app/models/user.rb

index 80dad87b568877664ad04bc661e13bae62e1e881..b52bcefefb432a001e40da00f84d7b01d6a9b240 100644 (file)
@@ -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