Merge remote-tracking branch 'upstream/pull/4661'

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b9f1af807f7e09ede8fc1eeea3865cf8736a6f52..c55a177b48bdb0529f08c4d174da56d64ca5ce81 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,6 +36,7 @@ class UsersController < ApplicationController
       users = users.where(:status => @params[:status]) if @params[:status]
       users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
 
+      @users_count = users.count
       @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)
     end
   end