diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 15:25:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-13 15:25:22 -0700 |
| commit | 67f815af058cf0a4dbf1dcea50eec2585cd7ee3a (patch) | |
| tree | 62ec513d1271298c74c185a3941cba243d673189 | |
| parent | d08810e2a6ef1597bfa7a1604f9e671a6f46c4bb (diff) | |
| download | rails-67f815af058cf0a4dbf1dcea50eec2585cd7ee3a.tar.gz rails-67f815af058cf0a4dbf1dcea50eec2585cd7ee3a.tar.bz2 rails-67f815af058cf0a4dbf1dcea50eec2585cd7ee3a.zip | |
no need to check for presence, script names can be blank
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 8f52071577..6fc799c0d2 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -658,8 +658,8 @@ module ActionDispatch recall = options.delete(:_recall) - original_script_name = options.delete(:original_script_name).presence - script_name = options.delete(:script_name).presence || _generate_prefix(options) + original_script_name = options.delete(:original_script_name) + script_name = options.delete(:script_name) || _generate_prefix(options) if script_name && original_script_name script_name = original_script_name + script_name |