diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-19 18:37:19 -0700 |
commit | acb1624f2732a4fcfa006c3e8694020635baba6b (patch) | |
tree | a1bbf079477b906c8fa31dfbfb94b7647544ccb7 /actionpack/lib/action_controller/metal | |
parent | 7ab30599a6c0ca44d68ca10383b07ba4a8bd75b4 (diff) | |
parent | 1f9d234a6b567e68d97e71da6f19bd126e7f7058 (diff) | |
download | rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.gz rails-acb1624f2732a4fcfa006c3e8694020635baba6b.tar.bz2 rails-acb1624f2732a4fcfa006c3e8694020635baba6b.zip |
Merge commit 'josevalim/fixes'
Conflicts:
railties/test/generators/app_generator_test.rb
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 3026067868..468c5f4fae 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -3,7 +3,8 @@ module ActionController #:nodoc: extend ActiveSupport::Concern included do - class_inheritable_reader :mimes_for_respond_to + extlib_inheritable_accessor :responder, :mimes_for_respond_to, :instance_writer => false + self.responder = ActionController::Responder clear_respond_to end @@ -46,7 +47,7 @@ module ActionController #:nodoc: # Clear all mimes in respond_to. # def clear_respond_to - write_inheritable_attribute(:mimes_for_respond_to, ActiveSupport::OrderedHash.new) + self.mimes_for_respond_to = ActiveSupport::OrderedHash.new end end @@ -221,10 +222,6 @@ module ActionController #:nodoc: end end - def responder - ActionController::Responder - end - protected # Collect mimes declared in the class method respond_to valid for the |