diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-28 13:28:50 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-28 13:28:50 -0800 |
| commit | fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3 (patch) | |
| tree | d1e66590ae67a5ca306613609bad4c513edfcfbb /actionpack/lib | |
| parent | dc53fe92404910a83cfc056d126f45772dfa58fe (diff) | |
| parent | 371a5f2d73f73243ec2440305fdfab64088f35a3 (diff) | |
| download | rails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.tar.gz rails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.tar.bz2 rails-fae2e4d05d122e2d711a90c0a46dfb4b42dbadc3.zip | |
Merge pull request #9366 from killthekitten/fix-content_for-regression
Fix for #9360 content_for regression
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/capture_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb index 4ec860d69a..1bad82159a 100644 --- a/actionpack/lib/action_view/helpers/capture_helper.rb +++ b/actionpack/lib/action_view/helpers/capture_helper.rb @@ -156,7 +156,7 @@ module ActionView end nil else - @view_flow.get(name) + @view_flow.get(name).presence end end |