Use current_user instead of directly accessing session[:userinfo]

Use current_user instead of directly accessing session[:userinfo] #3662