diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 01:33:57 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 01:33:57 +0000 |
| commit | 06c2b43f36c84ddd3e17ada057b3dc621d4140f0 (patch) | |
| tree | ba628a35089b46623f7d8ca3cfec68aa24cece4a /actionpack/lib/action_controller/base.rb | |
| parent | c5d5c4f708ab72b8ba9825017b854b02e0c8481c (diff) | |
| download | rails-06c2b43f36c84ddd3e17ada057b3dc621d4140f0.tar.gz rails-06c2b43f36c84ddd3e17ada057b3dc621d4140f0.tar.bz2 rails-06c2b43f36c84ddd3e17ada057b3dc621d4140f0.zip | |
Rendering xml shouldnt happen inside any layout. Added class proxying to RJS, so you can call page.field.clear("my_field") to generate Field.clear("my_field");. Added :content_type option to render, so you can change the content type on the fly. Do type/subtype reordering of Accept header preferences for xml types (aka make Firefox work with respond_to). CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3852 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 4663828c96..b0b6069420 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -634,6 +634,10 @@ module ActionController #:nodoc: end end + if content_type = options[:content_type] + headers["Content-Type"] = content_type + end + if text = options[:text] render_text(text, options[:status]) |