From a83d2149a320690471efc5a0082af542b046649d Mon Sep 17 00:00:00 2001
From: louant <louant@163.com>
Date: Wed, 29 Jun 2016 11:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E2=80=9CISSUE=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E5=A4=8D=20=E2=80=98=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E2=80=99=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E2=80=9D=20=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/issues_controller.rb | 17 ++++++++++++++++-
 app/helpers/issues_helper.rb         |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 44f0d15f4..640aa412b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -473,7 +473,22 @@ class IssuesController < ApplicationController
   def reply
     @issue = Issue.find(params[:id])
     @jour = Journal.find(params[:journal_id])
-    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
+    journal_details = @jour.details
+    @notes = ""
+    @note_temp = ""
+    #判断journal是否为引用
+    if @jour.notes != ""
+      @notes = @jour.notes
+    else
+      if @jour.details.any?
+        details_to_strings(@jour.details,false).each do |str|
+          @note_temp += str
+        end
+        @notes = @note_temp.gsub("</i> <strong>","</i><br /><strong>").gsub("</i><strong>","</i><br /><strong>").to_s
+      end
+    end
+    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@notes.html_safe}</blockquote>".html_safe
+    # @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
     respond_to do |format|
       format.js
     end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index b161e29e9..364ee29b6 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -20,6 +20,7 @@
 module IssuesHelper
   include ApplicationHelper
   include TagsHelper
+  include ERB::Util
   def issue_list(issues, &block)
     ancestors = []
     issues.each do |issue|