Merged r9420 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9436 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-18 17:42:50 +00:00
parent 6d8649b9d3
commit d6d064f875
2 changed files with 24 additions and 1 deletions
@@ -34,7 +34,7 @@ class Token < ActiveRecord::Base

  # Delete all expired tokens
  def self.destroy_expired
-    Token.delete_all ["action <> 'feeds' AND created_on < ?", Time.now - @@validity_time]
+    Token.delete_all ["action NOT IN (?) AND created_on < ?", ['feeds', 'api'], Time.now - @@validity_time]
  end

 private