<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -6,17 +6,13 @@ module ApplicationHelper
   
 
   def less_form_for name, *args, &amp;block
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    options = options.merge(:builder=&gt;LessFormBuilder)
-    args = (args &lt;&lt; options)
-    form_for name, *args, &amp;block
+    options = args.extract_options!
+    form_for name, *(args &lt;&lt; options.merge(:builder=&gt;LessFormBuilder)), &amp;block
   end
   
   def less_remote_form_for name, *args, &amp;block
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    options = options.merge(:builder=&gt;LessFormBuilder)
-    args = (args &lt;&lt; options)
-    remote_form_for name, *args, &amp;block
+    options = args.extract_options!
+    form_for name, *(args &lt;&lt; options.merge(:builder=&gt;LessFormBuilder)), &amp;block
   end
   
   </diff>
      <filename>app/helpers/application_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -29,7 +29,7 @@ class LessFormBuilder &lt; ActionView::Helpers::FormBuilder
       &quot;&lt;label for='#{options.delete(:for)}'&gt;#{text}&lt;/label&gt;&quot;
     else
       #need to use InstanceTag to build the correct ID for :for
-      ActionView::Helpers::InstanceTag.new(@object_name, method, self, nil, @object).to_label_tag(text, options)
+      ActionView::Helpers::InstanceTag.new(@object_name, method, self, @object).to_label_tag(text, options)
     end
   end
   </diff>
      <filename>lib/less_form_builder.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>688d30a367657752bd33e5d11a32457350d83a18</id>
    </parent>
  </parents>
  <author>
    <name>Jonathon Brenner</name>
    <email>jon@ladidadi.net</email>
  </author>
  <url>http://github.com/stevenbristol/lovd-by-less/commit/601cad8cafbaea79cbc16b77d1de0430d7bcdaae</url>
  <id>601cad8cafbaea79cbc16b77d1de0430d7bcdaae</id>
  <committed-date>2008-11-29T18:24:08-08:00</committed-date>
  <authored-date>2008-11-29T18:24:08-08:00</authored-date>
  <message>Fixed the call to the _undocumented_ InstanceTag. Bad Steven\!</message>
  <tree>52aa908f32ed8679787f029ed7da927d8063ff89</tree>
  <committer>
    <name>Jonathon Brenner</name>
    <email>jon@ladidadi.net</email>
  </committer>
</commit>
