diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-02-20 16:04:26 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-02-20 16:04:26 -0300 |
| commit | 53d7b2ffe9ccdf2ded9898e20a947ea7da63566e (patch) | |
| tree | 642be6739d726c6008f00fbb6142c05f9795f407 /actionpack | |
| parent | 9e4c1abd3f2e838c8d38b41913e2d4386f263323 (diff) | |
| parent | f6d9b689977c1dca1ed7f149f704d1b4344cd691 (diff) | |
| download | rails-53d7b2ffe9ccdf2ded9898e20a947ea7da63566e.tar.gz rails-53d7b2ffe9ccdf2ded9898e20a947ea7da63566e.tar.bz2 rails-53d7b2ffe9ccdf2ded9898e20a947ea7da63566e.zip | |
Merge pull request #14129 from joankaradimov/fix-render-to-string
Fix `render_to_string` when called via manually instantiated controllers
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 349bbf4ee7..9d10140ed2 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -106,7 +106,9 @@ module AbstractController def _normalize_render(*args, &block) options = _normalize_args(*args, &block) #TODO: remove defined? when we restore AP <=> AV dependency - options[:variant] = request.variant if defined?(request) && request.variant.present? + if defined?(request) && request && request.variant.present? + options[:variant] = request.variant + end _normalize_options(options) options end |