summaryrefslogtreecommitdiffstats
path: root/app/models/token.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-15 15:44:51 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-15 15:44:51 +0000
commitc7149f418408c0ad0b3b303469427ec9b1f2fae4 (patch)
tree035ca3d9765979d59619e69192a96471b5dc3e9e /app/models/token.rb
parent24c361eb0a122e4a86621879539a067cea068a12 (diff)
downloadredmine-c7149f418408c0ad0b3b303469427ec9b1f2fae4.tar.gz
redmine-c7149f418408c0ad0b3b303469427ec9b1f2fae4.zip
Fixed that Token.destroy_expired destroys API tokens.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9420 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/token.rb')
-rw-r--r--app/models/token.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/token.rb b/app/models/token.rb
index c6425f0fa..e97960251 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -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