use extract_options!

2013-07-02 17:05:18 +05:30 · 2013-07-02 17:05:18 +05:30 · 70568b4bbd
commit 70568b4bbd
parent f875d319ad
1 changed files with 1 additions and 1 deletions
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@ -71,7 +71,7 @@ def skip_action_callback(*names)
      # * <tt>name</tt>     - The callback to be added
      # * <tt>options</tt>  - A hash of options to be used when adding the callback
      def _insert_callbacks(callbacks, block = nil)
-        options = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
+        options = callbacks.extract_options!
        _normalize_callback_options(options)
        callbacks.push(block) if block
        callbacks.each do |callback|