Merged r13640 from 2.6-stable to trunk (#18280)

git-svn-id: http://svn.redmine.org/redmine/trunk@13641 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index e14cf5a0a47ef54c4e0c833b9e81c8610594d537..b488f2b669c2e9bebf8459dc7fc30e678cc44b0b 100644 (file)
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -99,7 +99,8 @@ class IssueStatus < ActiveRecord::Base
         " JOIN #{JournalDetail.table_name} d ON d.journal_id = j.id" +
         " WHERE j.journalized_type = 'Issue' AND j.journalized_id = #{Issue.table_name}.id" +
         " AND d.property = 'attr' AND d.prop_key = 'status_id' AND d.value = :status_id"
-      Issue.where(:status_id => id, :closed_on => nil).update_all(["closed_on = (#{subselect})", :status_id => id.to_s])
+      Issue.where(:status_id => id, :closed_on => nil).
+        update_all(["closed_on = (#{subselect})", {:status_id => id.to_s}])
 
       # Then we update issues that don't have a journal which means the
       # current status was set on creation