summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-10 13:29:47 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-06-10 13:29:47 +0000
commit4d12bea397bc1a79c16ec8000bbb8e5fae323c4b (patch)
tree7188c6d2f3e68c72a253f133ff07ea668f50134a
parent490bfc293476317f6eae884a4740decd9261c190 (diff)
downloadredmine-4d12bea397bc1a79c16ec8000bbb8e5fae323c4b.tar.gz
redmine-4d12bea397bc1a79c16ec8000bbb8e5fae323c4b.zip
Make sure we look for a feeds token.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9801 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index bcd46e96e..d0d1df834 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -341,7 +341,7 @@ class User < Principal
end
def self.find_by_rss_key(key)
- token = Token.find_by_value(key.to_s)
+ token = Token.find_by_action_and_value('feeds', key.to_s)
token && token.user.active? ? token.user : nil
end