aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/assertions.rb2
-rwxr-xr-xactiverecord/lib/active_record.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index 262515a068..00811d24d5 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -1,7 +1,7 @@
require 'test/unit'
require 'test/unit/assertions'
require 'rexml/document'
-require "#{File.dirname(__FILE__)}/vendor/html-scanner/html/document"
+require File.dirname(__FILE__) + "/vendor/html-scanner/html/document"
module Test #:nodoc:
module Unit #:nodoc:
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 05c6c89501..40ae8b8fd7 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -70,7 +70,7 @@ unless defined?(RAILS_CONNECTION_ADAPTERS)
end
RAILS_CONNECTION_ADAPTERS.each do |adapter|
- require "active_record/connection_adapters/#{adapter}_adapter"
+ require "active_record/connection_adapters/" + adapter + "_adapter"
end
require 'active_record/query_cache'