Skip addition to load path if an externally-provided lib is already in place. Just to keep the path shorter.

1 files changed, 5 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index d9dfc184da..8ba1dade91 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -4,7 +4,10 @@
     gem lib, "~> #{version}"
   # Use the vendored lib if the gem's missing or we aren't using RubyGems.
   rescue LoadError, NoMethodError
-    # Push, not unshift, so the vendored lib is lowest priority.
-    $LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/vendor/#{lib}-#{version}/lib")
+    # Skip if there's already a vendored lib already provided.
+    if $LOAD_PATH.grep(Regexp.new(lib)).empty?
+      # Push, not unshift, so the vendored lib is lowest priority.
+      $LOAD_PATH << File.expand_path("#{File.dirname(__FILE__)}/vendor/#{lib}-#{version}/lib")
+    end
   end
 end