diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-19 23:26:48 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-02-19 23:26:48 -0800 |
| commit | c3f1b1d3cdb837a24d66b80deda39cfe23856724 (patch) | |
| tree | d67ba9390795752a4c2afc5ff14bc009d45ff25a /actionpack/lib | |
| parent | 862e75160b0856c3f9165601b3c11b881e0844b9 (diff) | |
| parent | 5c73f0d398d2a7ed955040e580374e92d6536283 (diff) | |
| download | rails-c3f1b1d3cdb837a24d66b80deda39cfe23856724.tar.gz rails-c3f1b1d3cdb837a24d66b80deda39cfe23856724.tar.bz2 rails-c3f1b1d3cdb837a24d66b80deda39cfe23856724.zip | |
Merge pull request #9330 from bdmac/time_zone_select_dup
Fix time_zone_options_for_select to not mutate TimeZones array
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index 8b3a37a853..49473dd129 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -560,7 +560,7 @@ module ActionView def time_zone_options_for_select(selected = nil, priority_zones = nil, model = ::ActiveSupport::TimeZone) zone_options = "".html_safe - zones = model.all + zones = model.all.dup convert_zones = lambda { |list| list.map { |z| [ z.to_s, z.name ] } } if priority_zones |