diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2013-12-10 13:07:56 -0800 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2013-12-10 13:07:56 -0800 |
| commit | 308f37f94ddec2d2d37519ea751c70128c2a0e6b (patch) | |
| tree | 4c1e831fca000ef772ddbac9f8e26df1c89f1323 /actionpack/lib/action_dispatch | |
| parent | b5c5121f67c88a2be1c56e810f5c64013351ce79 (diff) | |
| parent | e6c602da9046a653747ce99c9cab7f08f572fa40 (diff) | |
| download | rails-308f37f94ddec2d2d37519ea751c70128c2a0e6b.tar.gz rails-308f37f94ddec2d2d37519ea751c70128c2a0e6b.tar.bz2 rails-308f37f94ddec2d2d37519ea751c70128c2a0e6b.zip | |
Merge pull request #12699 from drogus/fix-mounting-engine-in-resources
Fix mounting engines inside a resources block
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 846a6345cb..bfba8d143d 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -502,11 +502,12 @@ module ActionDispatch raise "A rack application must be specified" unless path options[:as] ||= app_name(app) + target_as = name_for_action(options[:as], path) options[:via] ||= :all match(path, options.merge(:to => app, :anchor => false, :format => false)) - define_generate_prefix(app, options[:as]) + define_generate_prefix(app, target_as) self end |