From: Jean-Philippe Lang Date: Sun, 10 Jun 2012 13:29:47 +0000 (+0000) Subject: Make sure we look for a feeds token. X-Git-Tag: 2.1.0~465 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4d12bea397bc1a79c16ec8000bbb8e5fae323c4b;p=redmine.git 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 --- 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