Merge branch 'comments'

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 9938984aa89a3d83cef907430c6288fed3aabe07..e2f163ea585bf8bd5453208c7da72dc24d360548 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,9 +1,9 @@
 class Acl < ActiveRecord::Base
   def self.match(address, domain = nil)
     if domain
-      condition = Acl.where("address >> ? OR domain = ?", address, domain)
+      condition = Acl.where("address >>= ? OR domain = ?", address, domain)
     else
-      condition = Acl.where("address >> ?", address)
+      condition = Acl.where("address >>= ?", address)
     end
   end
 
@@ -11,6 +11,10 @@ class Acl < ActiveRecord::Base
     self.match(address, domain).where(:k => "no_account_creation").exists?
   end
 
+  def self.no_note_comment(address, domain = nil)
+    self.match(address, domain).where(:k => "no_note_comment").exists?
+  end
+
   def self.no_trace_download(address, domain = nil)
     self.match(address, domain).where(:k => "no_trace_download").exists?
   end