From 628b94fbc81cb02b753d0f717a875219853b5764 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 1 Jul 2010 23:35:01 +0200
Subject: Pass routes via env['action_dispatch.routes'], it's needed by routes
 to determine if it should generate prefix for mounted apps

---
 railties/lib/rails/application.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails/application.rb')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index fee99faf43..4ea828c549 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -125,10 +125,10 @@ module Rails
     end
 
     def env_defaults
-      @env_defaults ||= {
+      @env_defaults ||= super.merge({
         "action_dispatch.parameter_filter" => config.filter_parameters,
         "action_dispatch.secret_token" => config.secret_token
-      }
+      })
     end
 
     def initializers
-- 
cgit v1.2.3