diff options
| author | Chris Kampmeier <chris@kampers.net> | 2009-05-03 18:09:06 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-04 08:32:25 -0700 |
| commit | d3ee8756c8b09b8524a9599926b02ededd27319c (patch) | |
| tree | bd2634a8e0083d50ee07e289b04efb7b41064619 /activerecord | |
| parent | 1c6fcbfd2d67ce2b2faa29d956566b48e9a61188 (diff) | |
| download | rails-d3ee8756c8b09b8524a9599926b02ededd27319c.tar.gz rails-d3ee8756c8b09b8524a9599926b02ededd27319c.tar.bz2 rails-d3ee8756c8b09b8524a9599926b02ededd27319c.zip | |
Don't use #tap before Active Support is available, since older versions of ruby don't have native implementations
[#2603 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 1982ffc791..06d6c87090 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -21,9 +21,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -"#{File.dirname(__FILE__)}/../../activesupport/lib".tap do |path| - $:.unshift(path) if File.directory?(path) -end +activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support' require 'active_support/core/all' |