aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/integration.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-01-28 07:16:55 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-01-28 07:16:55 +0000
commit0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 (patch)
tree74705adf7f9a35c750f74657f0c4a29a6dcce5ff /actionpack/lib/action_controller/integration.rb
parent4ac332fa9a16ae86b948251e372999b9f4618dec (diff)
downloadrails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.gz
rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.bz2
rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.zip
Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
-rw-r--r--actionpack/lib/action_controller/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index d77540a297..c2f1fcf1f9 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -72,7 +72,7 @@ module ActionController
self.remote_addr = "127.0.0.1"
self.accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"
- unless @named_routes_configured
+ unless defined? @named_routes_configured
# install the named routes in this session instance.
klass = class<<self; self; end
Routing::Routes.named_routes.install(klass)