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

10 years ago · 6cb21d3430
parent 17e9b2d293 65756967ad
commit 6cb21d3430
1 changed files with 1 additions and 1 deletions
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@ -55,4 +55,4 @@
  </div>
 </div>
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => @page} %>
+<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %>