Link GPX fixture files instead of stubbing

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

diff --git a/app/models/user.rb b/app/models/user.rb
index e6d7a4e46f31cfbbc3a7f2b3d7a88944ffabd4f2..3d5e71ea27de1cd192315570c36488fd5fadd5bc 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -94,7 +94,7 @@ class User < ActiveRecord::Base
       user = nil
     end
 
       user = nil
     end
 

-    token.update_column(:expiry, 1.week.from_now) if token && user
+    token.update(:expiry => 1.week.from_now) if token && user

 
     user
   end
 
     user
   end


@@ -233,7 +233,7 @@ class User < ActiveRecord::Base
   # perform a spam check on a user
   def spam_check
     if status == "active" && spam_score > SPAM_THRESHOLD
   # perform a spam check on a user
   def spam_check
     if status == "active" && spam_score > SPAM_THRESHOLD

-      update_column(:status, "suspended")
+      update(:status => "suspended")

     end
   end
 
     end
   end