]>
Commit | Line | Data |
---|---|---|
98766d36 | 1 | diff -Nur activerecord-2.1.0.orig/lib/active_record.rb activerecord-2.1.0.rubygems/lib/active_record.rb |
2 | --- activerecord-2.1.0.orig/lib/active_record.rb 2008-05-31 19:52:51.000000000 -0600 | |
3 | +++ activerecord-2.1.0.rubygems/lib/active_record.rb 2008-08-29 17:02:32.000000000 -0600 | |
4 | @@ -21,20 +21,7 @@ | |
5 | # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
6 | #++ | |
7 | ||
8 | -$:.unshift(File.dirname(__FILE__)) unless | |
9 | - $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) | |
10 | - | |
11 | -unless defined? ActiveSupport | |
12 | - active_support_path = File.dirname(__FILE__) + "/../../activesupport/lib" | |
13 | - if File.exist?(active_support_path) | |
14 | - $:.unshift active_support_path | |
15 | - require 'active_support' | |
16 | - else | |
17 | - require 'rubygems' | |
18 | - gem 'activesupport' | |
19 | - require 'active_support' | |
20 | - end | |
21 | -end | |
22 | +require 'active_support' | |
23 | ||
24 | require 'active_record/base' | |
25 | require 'active_record/named_scope' |