]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/changesets_controller.rb
Merge remote-tracking branch 'upstream/pull/2271'
[rails.git] / app / controllers / changesets_controller.rb
index fff9f543bf7f7dc3e95d0c49fa6f77e6267db466..82966a353437d1d0a0837b527d1583c9798f11ca 100644 (file)
@@ -4,10 +4,9 @@ class ChangesetsController < ApplicationController
   layout "site"
   require "xml/libxml"
 
-  skip_before_action :verify_authenticity_token, :except => [:index]
   before_action :authorize_web
   before_action :set_locale
-  before_action(:only => [:index, :feed]) { |c| c.check_database_readable(true) }
+  before_action -> { check_database_readable(true) }, :only => [:index, :feed]
 
   authorize_resource
 
@@ -54,7 +53,7 @@ class ChangesetsController < ApplicationController
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user
-        changesets = changesets.where(:user_id => current_user.friend_users.identifiable)
+        changesets = changesets.where(:user_id => current_user.friends.identifiable)
       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user_id => current_user.nearby)
       end