aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-05 18:36:27 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-05 18:36:27 -0800
commita2f7c1dc67b4cfd31d2b7840063b620ac1320d90 (patch)
tree7036b1f96220b8480fd942a13706b0db938da24e /activesupport/lib/active_support
parentb942ae836e1fd846e7d59413b6e97ac8192c3069 (diff)
downloadrails-a2f7c1dc67b4cfd31d2b7840063b620ac1320d90.tar.gz
rails-a2f7c1dc67b4cfd31d2b7840063b620ac1320d90.tar.bz2
rails-a2f7c1dc67b4cfd31d2b7840063b620ac1320d90.zip
make method signatures match the superclass signature
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/dependencies.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 2fcbdb0d3b..989c7205fa 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -236,13 +236,13 @@ module ActiveSupport #:nodoc:
raise
end
- def load(file, *)
+ def load(file, wrap = false)
result = false
load_dependency(file) { result = super }
result
end
- def require(file, *)
+ def require(file)
result = false
load_dependency(file) { result = super }
result