提交 af422bf3 编写于 作者: X Xavier Noria

Merge pull request #5772 from lest/patch-4

use extract_options! in cycle helper
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 @@ def simple_format(text, html_options={}, options={})
# </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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册