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

10 years ago · 8bb10728d0
parent d45d8a67d3 6c99674798
commit 8bb10728d0
1 changed files with 11 additions and 11 deletions
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@ -11,7 +11,7 @@
    .ke-inline-block{display: none;}
    div.ke-container{float:left;}
 </style>
-<% first_user_activity = user_activities.first.id %>
+<% first_user_activity = user_activities.first.id unless user_activities.first.nil? %>
 <% user_activities.each do |user_activity|
  if user_activities %>
        <script>