diff options
| author | Michael S. Klishin <michael@novemberain.com> | 2008-12-29 00:15:52 +0300 |
|---|---|---|
| committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-29 00:16:42 +0300 |
| commit | 19208e7422e191098bdbe3d12b75296777e2c75d (patch) | |
| tree | 2466083ad1b0dbdc5226f833bf8fa629277aaaae /railties | |
| parent | bdba0b9a7a2e3a593e44a64b38c31fa05ac0260c (diff) | |
| parent | 45dee3842d68359a189fe7c0729359bd5a905ea4 (diff) | |
| download | rails-19208e7422e191098bdbe3d12b75296777e2c75d.tar.gz rails-19208e7422e191098bdbe3d12b75296777e2c75d.tar.bz2 rails-19208e7422e191098bdbe3d12b75296777e2c75d.zip | |
Pull up some other changes from rails/rails/master
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails_generator/commands.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb index cacb3807d6..299044c3d7 100644 --- a/railties/lib/rails_generator/commands.rb +++ b/railties/lib/rails_generator/commands.rb @@ -294,7 +294,7 @@ HELP file(relative_source, relative_destination, template_options) do |file| # Evaluate any assignments in a temporary, throwaway binding. vars = template_options[:assigns] || {} - b = binding + b = template_options[:binding] || binding vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b } # Render the source file with the temporary binding. |