Fixes #242. Use the bundled copy of activerecord

git-svn-id: file:///home/svn/framework3/trunk@5861 4d416f70-5f16-0410-b530-b9f4589650da

lib/msf/core/db_manager.rb

@@ -26,6 +26,14 @@ class DBManager
 		@usable = false
 		@active = false
 		
+		#
+		# Prefer our local copy of active_record
+		#
+		dir_ar = File.join(Msf::Config.data_directory, 'msfweb', 'vendor', 'rails', 'activerecord', 'lib')
+		if(File.directory?(dir_ar) and not $:.include?(dir_ar))
+			$:.unshift(dir_ar)
+		end
+
 		# Load ActiveRecord if it is available
 		begin	
 			require 'rubygems'
@@ -75,4 +83,4 @@ class DBManager
 	end
 
 end
-end
+end