From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Mar 2011 00:09:59 +0000 (+0000)
Subject: Rework expansion of HTTP status code to work with rails 3
X-Git-Tag: live~6126
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f0d7c4a8d6373faa02ed941452ef904ee43ec447?ds=sidebyside

Rework expansion of HTTP status code to work with rails 3
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3506b4196..b9f98071c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -199,7 +199,7 @@ class ApplicationController < ActionController::Base
        request.headers['X-Error-Format'].downcase == "xml"
       result = OSM::API.new.get_xml_doc
       result.root.name = "osmError"
-      result.root << (XML::Node.new("status") << interpret_status(status))
+      result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result.root << (XML::Node.new("message") << message)
 
       render :text => result.to_s, :content_type => "text/xml"