Remove unrelated render :yaml changes. References #4185.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
189ecafa53
commit
953214bd23
|
@ -747,12 +747,9 @@ module ActionController #:nodoc:
|
|||
|
||||
elsif xml = options[:xml]
|
||||
render_xml(xml, options[:status])
|
||||
|
||||
|
||||
elsif json = options[:json]
|
||||
render_json(json, options[:callback], options[:status])
|
||||
|
||||
elsif yaml = options[:yaml]
|
||||
render_yaml(yaml, options[:status])
|
||||
|
||||
elsif partial = options[:partial]
|
||||
partial = default_template_name if partial == true
|
||||
|
@ -833,18 +830,13 @@ module ActionController #:nodoc:
|
|||
response.content_type = Mime::XML
|
||||
render_text(xml, status)
|
||||
end
|
||||
|
||||
|
||||
def render_json(json, callback = nil, status = nil) #:nodoc:
|
||||
json = "#{callback}(#{json})" unless callback.blank?
|
||||
|
||||
|
||||
response.content_type = Mime::JSON
|
||||
render_text(json, status)
|
||||
end
|
||||
|
||||
def render_yaml(yaml, status = nil) #:nodoc:
|
||||
response.content_type = Mime::YAML
|
||||
render_text(yaml, status)
|
||||
end
|
||||
|
||||
def render_nothing(status = nil) #:nodoc:
|
||||
render_text(' ', status)
|
||||
|
|
|
@ -19,11 +19,11 @@ class RespondToController < ActionController::Base
|
|||
type.all { render :text => "Nothing" }
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def json_or_yaml
|
||||
respond_to do |type|
|
||||
type.json { render :text => "JSON" }
|
||||
type.yaml { render :yaml => "YAML" }
|
||||
type.yaml { render :text => "YAML" }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue