diff options
| author | Leon Breedt <bitserf@gmail.com> | 2005-06-25 18:06:52 +0000 |
|---|---|---|
| committer | Leon Breedt <bitserf@gmail.com> | 2005-06-25 18:06:52 +0000 |
| commit | 07f237bdae9051cfc5bd38d7608f7a63de54e01b (patch) | |
| tree | faab90fe586da2645968064a509399cbe9394042 /actionwebservice/lib/action_web_service/dispatcher | |
| parent | 302c23d5a6c1df4a5a9f373e545db5f8a894bdd6 (diff) | |
| download | rails-07f237bdae9051cfc5bd38d7608f7a63de54e01b.tar.gz rails-07f237bdae9051cfc5bd38d7608f7a63de54e01b.tar.bz2 rails-07f237bdae9051cfc5bd38d7608f7a63de54e01b.zip | |
clean up cases where we override #inherited
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib/action_web_service/dispatcher')
| -rw-r--r-- | actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb index d3d74be289..d42851bf3b 100644 --- a/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb +++ b/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb @@ -6,12 +6,12 @@ module ActionWebService # :nodoc: module ActionController # :nodoc: def self.append_features(base) # :nodoc: super - base.extend(ClassMethods) + class << base + include ClassMethods + alias_method :inherited_without_action_controller, :inherited + alias_method :inherited, :inherited_with_action_controller + end base.class_eval do - class << self - alias_method :inherited_without_action_controller, :inherited - alias_method :inherited, :inherited_with_action_controller - end alias_method :web_service_direct_invoke_without_controller, :web_service_direct_invoke end base.add_web_service_api_callback do |klass, api| |