Merge remote-tracking branch 'upstream/pull/3061'

[rails.git] / app / models / acl.rb

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 895ed61e4de8883db9940f25c056222f4d2b6965..90dd7f3cf48d19f30f9b6a5da185b4af0744eed6 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -17,7 +17,7 @@
 #  index_acls_on_mx       (mx)
 #
 
 #  index_acls_on_mx       (mx)
 #
 

-class Acl < ActiveRecord::Base
+class Acl < ApplicationRecord

   validates :k, :presence => true
 
   def self.match(address, options = {})
   validates :k, :presence => true
 
   def self.match(address, options = {})


@@ -30,14 +30,14 @@ class Acl < ActiveRecord::Base
   end
 
   def self.no_account_creation(address, options = {})
   end
 
   def self.no_account_creation(address, options = {})

-    match(address, options).where(:k => "no_account_creation").exists?
+    match(address, options).exists?(:k => "no_account_creation")

   end
 
   def self.no_note_comment(address, domain = nil)
   end
 
   def self.no_note_comment(address, domain = nil)

-    match(address, :domain => domain).where(:k => "no_note_comment").exists?
+    match(address, :domain => domain).exists?(:k => "no_note_comment")

   end
 
   def self.no_trace_download(address, domain = nil)
   end
 
   def self.no_trace_download(address, domain = nil)

-    match(address, :domain => domain).where(:k => "no_trace_download").exists?
+    match(address, :domain => domain).exists?(:k => "no_trace_download")

   end
 end
   end
 end