Changeset 1060

Show
Ignore:
Timestamp:
12/01/07 23:07:10 (1 year ago)
Author:
e.@brainspl.at
Message:

fix that xmlbuilder templates woudl try to set the content type and override any provides that were set. closes #340 thanks codahale

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/template/xml_builder.rb

    r765 r1060  
    2929          opts, text, file, view_context = options.values_at(:opts, :text, :file, :view_context) 
    3030          xml_body = text ? text : IO.read(file)  
    31           view_context.headers['Content-Type'] = 'application/xml' 
     31          view_context.headers['Content-Type'] ||= 'application/xml' 
    3232          view_context.headers['Encoding']     = 'UTF-8' 
    3333          view_context.instance_eval %{