From 1c5d1ededb3ccaed4810b45b672f0a9e3ca52884 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 10 Jul 2005 19:38:33 +0000
Subject: Fixed that Action View should always use the included Builder, never
 attempt to require the gem, to ensure compatibility

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1802 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_view.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'actionpack/lib/action_view.rb')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index d2a54da15e..3c6e109caf 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -21,14 +21,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
-  require 'rubygems'
-  require 'builder'
-rescue LoadError
-  # RubyGems is not available, use included Builder
-  $:.unshift(File.dirname(__FILE__) + "/action_view/vendor")
-  require 'action_view/vendor/builder'
-end
+$:.unshift(File.dirname(__FILE__) + "/action_view/vendor")
+require 'action_view/vendor/builder'
 
 require 'action_view/base'
 require 'action_view/partials'
-- 
cgit v1.2.3