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

[rails.git] / script / update-spam-blocks

diff --git a/script/update-spam-blocks b/script/update-spam-blocks
index f14905b90cae1c183a7d62e8d36c96c307f1def2..40f2cb03c5715f4b89dece59964ad7ebb13bd16b 100755 (executable)
--- a/script/update-spam-blocks
+++ b/script/update-spam-blocks
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 #!/usr/bin/env ruby
 

-require File.dirname(__FILE__) + "/../config/environment"
+require File.join(File.dirname(__FILE__), "..", "config", "environment")

 require "generator"
 
 addresses = User.count(
 require "generator"
 
 addresses = User.count(


@@ -13,7 +13,7 @@ addresses = User.count(
 
 addresses.each do |address, count|
   next unless count > 1
 
 addresses.each do |address, count|
   next unless count > 1

-  next if Acl.where(:address => address).exists?
+  next if Acl.exists?(:address => address)

 
   Acl.create({
                :address => address,
 
   Acl.create({
                :address => address,