From 6c10624053f9c7ab4996a5d59f840e47c667bcde Mon Sep 17 00:00:00 2001
From: jake varghese <jakevarghese@jake.local>
Date: Thu, 7 Aug 2008 20:39:12 -0500
Subject: [PATCH] again

---
 .../lib/action_view/helpers/form_options_helper.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 9aae945..2f42ed5 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -95,8 +95,8 @@ module ActionView
       #
       # By default, <tt>post.person_id</tt> is the selected option.  Specify <tt>:selected => value</tt> to use a different selection
       # or <tt>:selected => nil</tt> to leave all options unselected.
-      def select(object, method, choices, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options)
+      def select(object, method, choices, options = {}, html_options = nil)
+        InstanceTag.new(object, method, self, options.delete(:object)).to_select_tag(choices, options, html_options || options.delete(:html))
       end
 
       # Returns <tt><select></tt> and <tt><option></tt> tags for the collection of existing return values of
-- 
1.5.5.3