diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-05-14 03:29:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 03:29:37 -0400 |
| commit | bd0618b1f3c684a7b5294e05e7c9abb0fd5b42d8 (patch) | |
| tree | bc51df2c2716d1ed434329622b83c7fc09549f5b /railties/lib | |
| parent | 7edb63009ed64bd227eaffd4ec1d7e662eb96f62 (diff) | |
| parent | 5df84533d5c93e32dff35a9ec51d7f1009793bfb (diff) | |
| download | rails-bd0618b1f3c684a7b5294e05e7c9abb0fd5b42d8.tar.gz rails-bd0618b1f3c684a7b5294e05e7c9abb0fd5b42d8.tar.bz2 rails-bd0618b1f3c684a7b5294e05e7c9abb0fd5b42d8.zip | |
Merge pull request #36237 from eileencodes/fix-erb-in-database-yaml-again
Fix database loading when ERB is single line ternary
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/dummy_erb_compiler.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/railties/lib/rails/application/dummy_erb_compiler.rb b/railties/lib/rails/application/dummy_erb_compiler.rb index c4659123bb..086b9e76f4 100644 --- a/railties/lib/rails/application/dummy_erb_compiler.rb +++ b/railties/lib/rails/application/dummy_erb_compiler.rb @@ -13,7 +13,12 @@ class DummyCompiler < ERB::Compiler # :nodoc: def compile_content(stag, out) case stag when "<%=" - out.push "_erbout << 'dummy_compiler'" + content = out.instance_variable_get(:@compiler).instance_variable_get(:@content) + if content.include?("?") && content.include?(":") + out.push "_erbout << 'dummy_key: dummy_value'" + else + out.push "_erbout << 'dummy_value'" + end end end end |