From bddd19c1e662e6e5565ec1b2968b2907780c35de Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 4 Dec 2011 09:45:18 +0000
Subject: [PATCH] Rails3: model: replace deprecated validate method at watcher
 model

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8072 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/watcher.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/watcher.rb b/app/models/watcher.rb
index de111185a..c42b55f5f 100644
--- a/app/models/watcher.rb
+++ b/app/models/watcher.rb
@@ -21,6 +21,7 @@ class Watcher < ActiveRecord::Base
 
   validates_presence_of :user
   validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
+  validate :validate_user
 
   # Unwatch things that users are no longer allowed to view
   def self.prune(options={})
@@ -37,7 +38,7 @@ class Watcher < ActiveRecord::Base
 
   protected
 
-  def validate
+  def validate_user
     errors.add :user_id, :invalid unless user.nil? || user.active?
   end