Skip to content

Commit 82ff37a

Browse files
committed
Delegate ERB args correctly
1 parent 0ead786 commit 82ff37a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/rdoc/erbio.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class RDoc::ERBIO < ERB
2020
##
2121
# Defaults +eoutvar+ to 'io', otherwise is identical to ERB's initialize
2222

23-
def initialize str, safe_level = nil, trim_mode = nil, eoutvar = 'io'
23+
def initialize str, safe_level = nil, legacy_trim_mode = nil, legacy_eoutvar = 'io', trim_mode: nil, eoutvar: 'io'
2424
if RUBY_VERSION >= '2.6'
2525
super(str, trim_mode: trim_mode, eoutvar: eoutvar)
2626
else
27-
super
27+
super(str, safe_level, legacy_trim_mode, legacy_eoutvar)
2828
end
2929
end
3030

lib/rdoc/generator/darkfish.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,9 @@ def template_for file, page = true, klass = ERB
779779
end
780780

781781
if RUBY_VERSION >= '2.6'
782-
template = klass.new template, trim_mode: '<>', eoutvar: erbout
782+
template = klass.new template, trim_mode: '-', eoutvar: erbout
783783
else
784-
template = klass.new template, nil, '<>', erbout
784+
template = klass.new template, nil, '-', erbout
785785
end
786786
@template_cache[file] = template
787787
template

0 commit comments

Comments
 (0)