From 33971922b3af559d6583b472d1520bc4d13daccc Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 3 Apr 2013 15:01:01 +0200
Subject: fix regression in Mapper when `format:` was used in a `scope`.

Closes #10071

`#normalize_path!` depends on the options so we need to call
`#normalize_options!` first to make sure everything is set correctly.
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch/routing')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index c5f2b33602..399f6529a7 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -58,8 +58,8 @@ module ActionDispatch
           @set, @scope, @path, @options = set, scope, path, options
           @requirements, @conditions, @defaults = {}, {}, {}
 
-          normalize_path!
           normalize_options!
+          normalize_path!
           normalize_requirements!
           normalize_conditions!
           normalize_defaults!
-- 
cgit v1.2.3