diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-07-30 13:00:15 -0500 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-07-30 13:00:15 -0500 |
| commit | 5373bf228d1273deae0ed03370ec4a63c580422b (patch) | |
| tree | e599b78b39c66d83fb05fae03290ecd6927e91a0 /actionpack/lib/action_controller | |
| parent | 70009e31005220ddacce0a27a2908858be268a0a (diff) | |
| parent | 22f592401444a83b7b2d3c2165ac666d69955d08 (diff) | |
| download | rails-5373bf228d1273deae0ed03370ec4a63c580422b.tar.gz rails-5373bf228d1273deae0ed03370ec4a63c580422b.tar.bz2 rails-5373bf228d1273deae0ed03370ec4a63c580422b.zip | |
Merge pull request #21057 from schneems/schneems/journey-formatter-objects
Beyond Ludicrous Speed
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/url_for.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb index 5a0e5c62e4..dbf7241a14 100644 --- a/actionpack/lib/action_controller/metal/url_for.rb +++ b/actionpack/lib/action_controller/metal/url_for.rb @@ -41,7 +41,11 @@ module ActionController if original_script_name options[:original_script_name] = original_script_name else - options[:script_name] = same_origin ? request.script_name.dup : script_name + if same_origin + options[:script_name] = request.script_name.empty? ? "".freeze : request.script_name.dup + else + options[:script_name] = script_name + end end options.freeze else |