diff options
Diffstat (limited to 'activesupport/lib')
3 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/breakpoint.rb b/activesupport/lib/active_support/breakpoint.rb index ab2efd39d0..785dac7596 100755 --- a/activesupport/lib/active_support/breakpoint.rb +++ b/activesupport/lib/active_support/breakpoint.rb @@ -16,7 +16,7 @@ # license please contact me.
require 'irb'
-require File.dirname(__FILE__) + '/binding_of_caller'
+require File.dirname(__FILE__) + '/binding_of_caller' unless defined? Binding.of_caller
require 'drb'
require 'drb/acl'
diff --git a/activesupport/lib/active_support/core_ext/integer/inflections.rb b/activesupport/lib/active_support/core_ext/integer/inflections.rb index a86c4cc26c..94721cfc7c 100644 --- a/activesupport/lib/active_support/core_ext/integer/inflections.rb +++ b/activesupport/lib/active_support/core_ext/integer/inflections.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../inflector' +require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module Integer #:nodoc: diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb index 9b5e9ddfcd..5d19702719 100644 --- a/activesupport/lib/active_support/core_ext/string/inflections.rb +++ b/activesupport/lib/active_support/core_ext/string/inflections.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../../inflector' +require File.dirname(__FILE__) + '/../../inflector' unless defined? Inflector module ActiveSupport #:nodoc: module CoreExtensions #:nodoc: module String #:nodoc: |