aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine/configuration.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-23 16:12:51 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-23 16:12:51 -0700
commitd77b576c0330d8b1c6189cb94814382ce32baab6 (patch)
treedbbb688300dca5a6c2332b94e8fefbe3bbb6ef8b /railties/lib/rails/engine/configuration.rb
parent4001835db00ce44cb75bca33ec02cd76b8ccc790 (diff)
downloadrails-d77b576c0330d8b1c6189cb94814382ce32baab6.tar.gz
rails-d77b576c0330d8b1c6189cb94814382ce32baab6.tar.bz2
rails-d77b576c0330d8b1c6189cb94814382ce32baab6.zip
require the constants we use. ensure that root always returns a Pathname
Diffstat (limited to 'railties/lib/rails/engine/configuration.rb')
-rw-r--r--railties/lib/rails/engine/configuration.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index e31df807a6..f82c1d00fb 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -1,4 +1,5 @@
require 'rails/railtie/configuration'
+require 'pathname'
module Rails
class Engine
@@ -8,7 +9,7 @@ module Rails
def initialize(root=nil)
super()
- @root = root
+ @root = root && Pathname.new(root)
@generators = app_generators.dup
end