aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-08-23 17:04:05 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-08-23 17:04:05 -0700
commit29004de1a2ded5e8705d421ffe60ff6f631110b1 (patch)
treecff8fc67a9b628b7cab783d00ea8a171a35c775f
parenta10606c490471d8e1483acb3b31d7f2d51e9ebbe (diff)
downloadrails-29004de1a2ded5e8705d421ffe60ff6f631110b1.tar.gz
rails-29004de1a2ded5e8705d421ffe60ff6f631110b1.tar.bz2
rails-29004de1a2ded5e8705d421ffe60ff6f631110b1.zip
`load` should also return the value from `super`
-rw-r--r--activesupport/lib/active_support/dependencies.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index cc6e811224..6252e7f7c3 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -229,7 +229,9 @@ module ActiveSupport #:nodoc:
end
def load(file, *)
- load_dependency(file) { super }
+ result = false
+ load_dependency(file) { result = super }
+ result
end
def require(file, *)