diff options
| author | Alexey Vakhov <vakhov@gmail.com> | 2011-10-11 12:48:03 +0400 |
|---|---|---|
| committer | Alexey Vakhov <vakhov@gmail.com> | 2011-10-11 12:48:03 +0400 |
| commit | 50d262f52ab39680b031e485b89b64875c08358e (patch) | |
| tree | 3aea716cf7f577e9b0395f440b901f786b912879 /actionpack/lib | |
| parent | 1735868c61bc9925f8fabdaea4c44e4b5962b8f4 (diff) | |
| download | rails-50d262f52ab39680b031e485b89b64875c08358e.tar.gz rails-50d262f52ab39680b031e485b89b64875c08358e.tar.bz2 rails-50d262f52ab39680b031e485b89b64875c08358e.zip | |
Support symbol and string actions in AC#respond_to options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index f10287afb4..00bd1706e7 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -42,8 +42,8 @@ module ActionController #:nodoc: def respond_to(*mimes) options = mimes.extract_options! - only_actions = Array(options.delete(:only)) - except_actions = Array(options.delete(:except)) + only_actions = Array(options.delete(:only)).map(&:to_s) + except_actions = Array(options.delete(:except)).map(&:to_s) new = mimes_for_respond_to.dup mimes.each do |mime| @@ -245,7 +245,7 @@ module ActionController #:nodoc: # current action. # def collect_mimes_from_class_level #:nodoc: - action = action_name.to_sym + action = action_name.to_s self.class.mimes_for_respond_to.keys.select do |mime| config = self.class.mimes_for_respond_to[mime] |