From 8d64114c5827f526a08e0d9a9729aa9d17f1a65a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 22 Sep 2015 17:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=BC=95=E7=94=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/journals_controller.rb | 9 ++++-----
 app/views/issues/show.html.erb         | 8 ++------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 6cebfef7a..769e62209 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -36,8 +36,7 @@ class JournalsController < ApplicationController
     sort_update(@query.sortable_columns)
 
     if @query.valid?
-      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
-                                  :limit => 25)
+      @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", :limit => 25)
     end
     @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
     render :layout => false, :content_type => 'application/atom+xml'
@@ -72,9 +71,9 @@ class JournalsController < ApplicationController
     end
     # Replaces pre blocks with [...]
     text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
-    @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> "
-    @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
-    # @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content
+    @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n"
+    @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n"
+    @content = "<blockquote style='word-break: break-all;word-wrap: break-word;'>" << @content << "</blockquote>"
     @id = user.id
   rescue ActiveRecord::RecordNotFound
     render_404
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 01cbea1c1..d57be8a91 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -20,12 +20,8 @@
       </p><br/>
 
       <div class="cl"></div>
-      <p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
-        <%# if @issue.created_on != @issue.updated_on %>
-            添加于 <%= format_time(@issue.created_on).html_safe %>
-        <%# else %>
-         <%#= format_time(@issue.updated_on).html_safe %>
-        <%# end %>
+      由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
+        添加于 <%= format_time(@issue.created_on).html_safe %>
     </div>
     <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>