[packages/ruby-activerecord.git] / ruby-activerecord-rubygems.patch

diff --git a/lib/active_record.rb b/lib/active_record.rb
index 2f8c5c7..424faeb 100644
--- a/lib/active_record.rb
+++ b/lib/active_record.rb
@@ -21,15 +21,7 @@
 # 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
-end
+require 'active_support'
 
 module ActiveRecord
   # TODO: Review explicit loads to see if they will automatically be handled by the initilizer.
Commit	Line	Data
85e61527 JR	1	diff --git a/lib/active_record.rb b/lib/active_record.rb
	2	index 2f8c5c7..424faeb 100644
	3	--- a/lib/active_record.rb
	4	+++ b/lib/active_record.rb
	5	@@ -21,15 +21,7 @@
98766d36	6	# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	7	#++
	8
85e61527 JR	9	-begin
	10	- require 'active_support'
	11	-rescue LoadError
	12	- activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
	13	- if File.directory?(activesupport_path)
	14	- $:.unshift activesupport_path
98766d36	15	- require 'active_support'
	16	- end
	17	-end
	18	+require 'active_support'
	19
85e61527 JR	20	module ActiveRecord
85e61527 JR	21	# TODO: Review explicit loads to see if they will automatically be handled by the initilizer.