From 6bafc93435556a253329c0dbc63b63224614e605 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 1 May 2012 20:40:59 +0100 Subject: [PATCH] Error in a changeset feed is requested for a non-existent user --- app/controllers/application_controller.rb | 5 ++++- app/controllers/changeset_controller.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 791334d2d..b512a404d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -399,7 +399,10 @@ class ApplicationController < ActionController::Base @title = t "user.no_such_user.title" @not_found_user = name - render :template => "user/no_such_user", :status => :not_found + respond_to do |format| + format.html { render :template => "user/no_such_user", :status => :not_found } + format.all { render :nothing => true, :status => :not_found } + end end private diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 34ca24762..947732fb1 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -260,7 +260,7 @@ class ChangesetController < ApplicationController else changesets = changesets.where("false") end - elsif request.format == :html + else render_unknown_user params[:display_name] return end -- 2.43.2