Merge pull request #5772 from lest/patch-4

use extract_options! in cycle helper
This commit is contained in:
Xavier Noria 2012-04-07 15:03:27 -07:00
commit af422bf3c5
1 changed files with 4 additions and 6 deletions

View File

@ -1,5 +1,6 @@
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/string/filters'
require 'active_support/core_ext/array/extract_options'
module ActionView
# = Action View Text Helpers
@ -306,12 +307,9 @@ module ActionView
# </tr>
# <% end %>
def cycle(first_value, *values)
if (values.last.instance_of? Hash)
params = values.pop
name = params[:name]
else
name = "default"
end
options = values.extract_options!
name = options.fetch(:name, "default")
values.unshift(first_value)
cycle = get_cycle(name)