diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erb.rb | 10 | ||||
| -rw-r--r-- | lib/rdoc/erb_partial.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index b876ca4625..73fc574314 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -590,7 +590,7 @@ class ERB end def add_insert_cmd(out, content) - out.push("#{@insert_cmd}((#{content}))") + out.push("#{@insert_cmd}((#{content}).to_s)") end # Compiles an ERB template into Ruby code. Returns an array of the code @@ -835,10 +835,10 @@ class ERB # requires the setup of an ERB _compiler_ object. # def set_eoutvar(compiler, eoutvar = '_erbout') - compiler.put_cmd = "#{eoutvar}.push" - compiler.insert_cmd = "#{eoutvar}.push" - compiler.pre_cmd = ["#{eoutvar} = []"] - compiler.post_cmd = ["#{eoutvar}.join.force_encoding(__ENCODING__)"] + compiler.put_cmd = "#{eoutvar}.concat" + compiler.insert_cmd = "#{eoutvar}.concat" + compiler.pre_cmd = ["#{eoutvar} = ''"] + compiler.post_cmd = ["#{eoutvar}.force_encoding(__ENCODING__)"] end # Generate results and print them. (see ERB#result) diff --git a/lib/rdoc/erb_partial.rb b/lib/rdoc/erb_partial.rb index ebb8cb3117..d17dda20a9 100644 --- a/lib/rdoc/erb_partial.rb +++ b/lib/rdoc/erb_partial.rb @@ -12,7 +12,7 @@ class RDoc::ERBPartial < ERB def set_eoutvar compiler, eoutvar = '_erbout' super - compiler.pre_cmd = ["#{eoutvar} ||= []"] + compiler.pre_cmd = ["#{eoutvar} ||= ''"] end end |