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

app/views/files/_tag_yun.html.erb

@@ -1,4 +1,4 @@
-<% if course && tag_list.empty? == false%>
+<% if course && tag_list && tag_list.empty? == false%>
 <span class="files_tag_icon" >
           <a  title=""
               onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','','<%= @q%>','<%= course.id%>');"

app/views/layouts/new_base_user.html.erb

@@ -46,7 +46,7 @@
         </div>
         <div class="fl ml10">
           <p class="homepageImageName hidden db mb5">
-            <%= @user.login %>
+            <%= @user.realname %>
           </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>