diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-31 15:46:48 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-31 15:46:48 -0700 |
| commit | 0a16cf19c2e2a2ba5cdb6ca849b60751f6cb52ed (patch) | |
| tree | 194be28e7ac78b53f8544872e57c7a6a47160ca0 /actionpack/lib/action_view | |
| parent | 31216ec84b6988683c0c60e1ff08163a75d27680 (diff) | |
| parent | 53d68bd964af17484898c5cd5e21a8ce9c359143 (diff) | |
| download | rails-0a16cf19c2e2a2ba5cdb6ca849b60751f6cb52ed.tar.gz rails-0a16cf19c2e2a2ba5cdb6ca849b60751f6cb52ed.tar.bz2 rails-0a16cf19c2e2a2ba5cdb6ca849b60751f6cb52ed.zip | |
Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select
Revert grep to select since they are not the same
Diffstat (limited to 'actionpack/lib/action_view')
| -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 8368e3de43..7e65ebb4e4 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -565,7 +565,7 @@ module ActionView if priority_zones if priority_zones.is_a?(Regexp) - priority_zones = zones.grep(priority_zones) + priority_zones = zones.select { |z| z =~ priority_zones } end zone_options.safe_concat options_for_select(convert_zones[priority_zones], selected) |