Merge 16110:16487 from trunk.

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 8c20ddb4d59fdd8662f2a62b232eafbf402c1dbf..cc1758bf35696742c30e758d20621fb80086ccf1 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -7,6 +7,7 @@ class ChangesetController < ApplicationController
   before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
   before_filter :set_locale, :only => [:list, :list_user, :list_bbox]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
+  before_filter :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :check_api_writable, :only => [:create, :update, :delete, :upload, :include]
   before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query]
@@ -265,7 +266,7 @@ class ChangesetController < ApplicationController
         else
           conditions = cond_merge conditions, ['false']
         end
-      elsif params[:format] == 'rhtml'
+      elsif request.format == :html
         @title = t 'user.no_such_user.title'
         @not_found_user = params[:display_name]
         render :template => 'user/no_such_user', :status => :not_found