From 945bf9c254b5bfb56df874c1a3f7f0f1e89dc8b8 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 2 May 2009 15:16:12 -0700
Subject: [PATCH] Check for sibling Active Support first

---
 activerecord/lib/active_record.rb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 500a90d6cb..1982ffc791 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -21,15 +21,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
-  require 'active_support'
-rescue LoadError
-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  if File.directory?(activesupport_path)
-    $:.unshift activesupport_path
-    require 'active_support'
-  end
+"#{File.dirname(__FILE__)}/../../activesupport/lib".tap do |path|
+  $:.unshift(path) if File.directory?(path)
 end
+require 'active_support'
 require 'active_support/core/all'
 
 module ActiveRecord