Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/attachments/_links.html.erb

@@ -33,7 +33,6 @@
   	<% end %>
   <% end %>
   <% if options[:author] %>
-      <!-- modified by zjc author添加超链接 -->
     <span class="author" title="attachment.author">
       <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>,
       <%= format_time(attachment.created_on) %>

app/views/memos/show.html.erb

@@ -61,7 +61,6 @@
 			</p>
 			<div class="clearfix"></div>
 		</div>
-      <!-- modified by zjc 修正名字无链接问题 -->
 		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
 
 	</div>
@@ -128,7 +127,6 @@
 				</td>
 			</tr>
 			<tr>
-              <!-- modified by zjc 修正名字无链接问题 -->
 				<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author %></td>
 			</tr>
 		</table>