From 500b54a46617a9078ee3d88f6b08a834a39fb3d8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 3 Apr 2015 15:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=98=AFhtml=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb | 11 +----------
 app/views/memos/quote.js.erb           |  2 +-
 app/views/messages/quote.js.erb        |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 2ad388f41..4c44b6ddb 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -189,16 +189,7 @@ class MessagesController < ApplicationController
 
     @content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
     @temp = Message.new
-    #@temp.content = "> #{ll(Setting.default_language, :text_user_wrote, @message.author)}> "
-    @content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    @content_html = textilizable(@content)
-    @temp.content = @content_html
-    #@content = "#{ll(Setting.default_language, :text_user_wrote, @message.author)} <br/> &nbsp; "
-    #@content << @message.content.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n") + "</blockquote>\n\n<br/>"
-    #@content = "<blockquote>" << @content
-    #@temp = Message.new
-    #@temp.content = @content
-
+    @temp.content = "<blockquote>#{@message.content.html_safe}</blockquote>".html_safe
   end
 
   def preview
diff --git a/app/views/memos/quote.js.erb b/app/views/memos/quote.js.erb
index d2e8c1d17..b3d860916 100644
--- a/app/views/memos/quote.js.erb
+++ b/app/views/memos/quote.js.erb
@@ -1,4 +1,4 @@
 //ckeditor.setData("<%= raw escape_javascript(@content) %>");
-$('#message_quote').html("<%= raw escape_javascript(@temp.content) %>");
+$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 $('#quote').val("<%= raw escape_javascript(@content) %>");
 showAndScrollTo("new_memo", "cke_editor01");
\ No newline at end of file
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index f8ec37d75..3d8fe7237 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,5 +1,5 @@
 $('#message_subject').val("<%= raw escape_javascript(@subject) %>");
-$('#message_quote').html("<%= raw escape_javascript(@temp.content) %>");
+$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
 //$('#message_content').val("<#%= raw escape_javascript(@content) %>");
 $('#quote_quote').html("<%= raw escape_javascript(@content) %>");