Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 0c89968289e60e78d806230f9851535d795c6115..8bb4ae4b9dd8ebf294419aa141ebeaea5f4d7994 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)
+      Acl.where("address >>= ? OR domain = ?", address, domain)
     else
-      condition = Acl.where("address >>= ?", address)
+      Acl.where("address >>= ?", address)
     end
   end