From 973a59042ce76901d5d3b07d18a858122dfec258 Mon Sep 17 00:00:00 2001
From: fanqiang <316257774@qq.com>
Date: Tue, 20 May 2014 16:33:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=96=E5=AD=90=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B7=E5=90=8D=E4=B8=8E=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb      | 8 ++++++++
 app/views/relative_memos/show.html.erb | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6b8525a00..cbfdca556 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -456,6 +456,14 @@ module ApplicationHelper
   def added_time(created)
     l(:label_added_time, :age => time_tag(created)).html_safe
   end
+  
+  def user_url_and_time(user_name, user_url, created)
+    unless user_name.nil?
+      l(:label_added_time_by, :author => link_to(user_name, user_url), :age => time_tag(created)).html_safe
+    else
+      l(:label_added_time, :age => time_tag(created)).html_safe
+    end
+  end
 
   #huang
   def betweentime(enddate)
diff --git a/app/views/relative_memos/show.html.erb b/app/views/relative_memos/show.html.erb
index be870b7eb..dad042a45 100644
--- a/app/views/relative_memos/show.html.erb
+++ b/app/views/relative_memos/show.html.erb
@@ -62,7 +62,7 @@
 			<% if @memo.author %>
 			<%= authoring @memo.created_at, @memo.author.name %>
 			<% else %>
-			<%= added_time @memo.created_at %>
+			<%= user_url_and_time @memo.username, @memo.userhomeurl, @memo.created_at %>
 			<% end %></div>
 		<div class="tags">
 			<div id="tags">
@@ -142,7 +142,7 @@
 					<% if reply.author %>
 						<%= authoring reply.created_at, reply.author.name %>
 					<% else %>
-						<%= added_time reply.created_at %>
+						<%= user_url_and_time reply.username, reply.userhomeurl, reply.created_at %>
 					<% end %></td>
 			</tr>
 		</table>