Drop with_format and user the new :formats render option instead

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 9938984aa89a3d83cef907430c6288fed3aabe07..2db7fb76522a0342324d235367ae51d0c5932c97 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
 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
     else

-      condition = Acl.where("address >> ?", address)
+      condition = Acl.where("address >>= ?", address)

     end
   end
 
     end
   end