diff app/controllers/messages_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/app/controllers/messages_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/messages_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -113,7 +113,7 @@
     @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
 
     @content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
-    @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
+    @content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
   end
 
   def preview
@@ -126,14 +126,14 @@
 private
   def find_message
     return unless find_board
-    @message = @board.messages.find(params[:id], :include => :parent)
+    @message = @board.messages.includes(:parent).find(params[:id])
     @topic = @message.root
   rescue ActiveRecord::RecordNotFound
     render_404
   end
 
   def find_board
-    @board = Board.find(params[:board_id], :include => :project)
+    @board = Board.includes(:project).find(params[:board_id])
     @project = @board.project
   rescue ActiveRecord::RecordNotFound
     render_404