diff app/models/watcher.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/models/watcher.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/models/watcher.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -42,7 +42,7 @@
       prune_single_user(options[:user], options)
     else
       pruned = 0
-      User.where("id IN (SELECT DISTINCT user_id FROM #{table_name})").all.each do |user|
+      User.where("id IN (SELECT DISTINCT user_id FROM #{table_name})").each do |user|
         pruned += prune_single_user(user, options)
       end
       pruned
@@ -60,13 +60,14 @@
   def self.prune_single_user(user, options={})
     return unless user.is_a?(User)
     pruned = 0
-    where(:user_id => user.id).all.each do |watcher|
+    where(:user_id => user.id).each do |watcher|
       next if watcher.watchable.nil?
-
       if options.has_key?(:project)
-        next unless watcher.watchable.respond_to?(:project) && watcher.watchable.project == options[:project]
+        unless watcher.watchable.respond_to?(:project) &&
+                 watcher.watchable.project == options[:project]
+          next
+        end
       end
-
       if watcher.watchable.respond_to?(:visible?)
         unless watcher.watchable.visible?(user)
           watcher.destroy