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

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

diff --git a/script/update-spam-blocks b/script/update-spam-blocks
index f14905b90cae1c183a7d62e8d36c96c307f1def2..b5656f6ac0b5b7aad20208084b990789985fdc9b 100755 (executable)
--- a/script/update-spam-blocks
+++ b/script/update-spam-blocks
@@ -1,19 +1,19 @@
 #!/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(
   :conditions => {
     :status => %w[suspended deleted],
 require "generator"
 
 addresses = User.count(
   :conditions => {
     :status => %w[suspended deleted],

-    :creation_time => Time.now - 28.days..Time.now
+    :creation_time => Time.now.utc - 28.days..Time.now.utc

   },
   :group => :creation_ip
 )
 
 addresses.each do |address, count|
   next unless count > 1
   },
   :group => :creation_ip
 )
 
 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,