cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More test work

Browse source
This commit is contained in:
Tom Hughes 2015-03-08 00:48:13 +00:00
parent 6ce635d5d3
commit 7fef0353f2
6 changed files with 210 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/changeset_controller.rb
View file

@ -254,7 +254,7 @@ class ChangesetController < ApplicationController
# list edits (open changesets) in reverse chronological order
def list
if request.format == :atom && params[:max_id]
redirect_to params.merge(:max_id => nil), :status => :moved_permanently
redirect_to url_for(params.merge(:max_id => nil)), :status => :moved_permanently
return
end
@ -266,7 +266,7 @@ class ChangesetController < ApplicationController
end
end
if (params[:friends] || params[:nearby]) && !@user && request.format == :html
if (params[:friends] || params[:nearby]) && !@user
require_user
return
end

5
app/controllers/oauth_controller.rb
View file

@ -38,11 +38,6 @@ class OauthController < ApplicationController
protected
def oauth1_authorize
unless @token
render :action => "authorize_failure"
return
end
if @token.invalidated?
@message = t "oauth.oauthorize_failure.invalid"
render :action => "authorize_failure"