diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-09-14 17:11:04 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-09-14 17:11:13 -0700 |
commit | 8a47e872671a331bda634ee8e9f886b8089a8754 (patch) | |
tree | 4cdef402e18a8b1574ccb5dffec3ac9d81f1e46e /actionview/lib/action_view/template/handlers | |
parent | ac941096bf31a5e0957ba78df5768ec4b2014822 (diff) | |
download | rails-8a47e872671a331bda634ee8e9f886b8089a8754.tar.gz rails-8a47e872671a331bda634ee8e9f886b8089a8754.tar.bz2 rails-8a47e872671a331bda634ee8e9f886b8089a8754.zip |
handle <%== nil %> cases
This is much less common than string literal appends, so add a special
case method for it. Maybe fixes bug reported by @jeremy on 97ef636191933f1d4abc92fc10871e6d1195285c
Diffstat (limited to 'actionview/lib/action_view/template/handlers')
-rw-r--r-- | actionview/lib/action_view/template/handlers/erb.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/handlers/erb.rb b/actionview/lib/action_view/template/handlers/erb.rb index 4523060442..3c2224fbf5 100644 --- a/actionview/lib/action_view/template/handlers/erb.rb +++ b/actionview/lib/action_view/template/handlers/erb.rb @@ -49,9 +49,9 @@ module ActionView def add_expr_escaped(src, code) flush_newline_if_pending(src) if code =~ BLOCK_EXPR - src << "@output_buffer.safe_append= " << code + src << "@output_buffer.safe_expr_append= " << code else - src << "@output_buffer.safe_append=(" << code << ");" + src << "@output_buffer.safe_expr_append=(" << code << ");" end end |