aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-06-30 09:01:46 -0700
committerCarl Lerche <carllerche@mac.com>2009-06-30 09:01:46 -0700
commitf66b5d79c15c92e0712315b5843e611114390a12 (patch)
treed035c015bb759b20fa59a9cb84d72e54bf34934b
parent4954379283099231965fbc3fe00c39e0ef91c4b0 (diff)
downloadrails-f66b5d79c15c92e0712315b5843e611114390a12.tar.gz
rails-f66b5d79c15c92e0712315b5843e611114390a12.tar.bz2
rails-f66b5d79c15c92e0712315b5843e611114390a12.zip
Stop the initializer from blowing up when builtin_directories is empty
-rw-r--r--railties/lib/rails/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 59132efe98..7a903211fa 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -76,7 +76,7 @@ module Rails
@paths.config.locales = "config/locales"
@paths.config.environments = "config/environments"
- @paths.app.controllers.push *builtin_directories
+ builtin_directories.each { |dir| @paths.app.controllers << dir }
@paths.app.load_path!
@paths.app.metals.load_path!