From ba693fe2e232dd85d2a94776f38afab329bb8103 Mon Sep 17 00:00:00 2001 From: Marcos Arias Date: Fri, 20 Feb 2009 15:11:01 +0100 Subject: [PATCH] Fixed a problem in middleware stack initialization --- .../lib/action_controller/middleware_stack.rb | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/actionpack/lib/action_controller/middleware_stack.rb b/actionpack/lib/action_controller/middleware_stack.rb index ee0ae48..4ab1b36 100644 --- a/actionpack/lib/action_controller/middleware_stack.rb +++ b/actionpack/lib/action_controller/middleware_stack.rb @@ -13,14 +13,13 @@ module ActionController def initialize(klass, *args, &block) @klass = klass - - options = args.extract_options! - if options.has_key?(:if) - @conditional = options.delete(:if) + + if args.last.is_a?(Hash) && args.last.has_key?(:if) + @conditional = args.last.delete(:if) + args.pop if args.last.empty? else @conditional = true end - args << options unless options.empty? @args = args @block = block -- 1.6.1.2