Prefer sibling Active Support

rails · May 6, 2009 · a05cfb6 · a05cfb6
1 parent 2f42433
commit a05cfb6
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb
@@ -21,15 +21,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
+activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  require 'active_support'
+$:.unshift(activesupport_path) if File.directory?(activesupport_path)
-rescue LoadError
+require 'active_support'
-  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  if File.directory?(activesupport_path)
-    $:.unshift activesupport_path
-    require 'active_support'
-  end
-end
 require 'active_support/core/all'
 
 require 'active_resource/formats'