0
@@ -613,7 +613,8 @@ module ActionController #:nodoc:
0
       #
0
       # This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
0
       # would have slashed-off the path components after the changed action.
0
-      def url_for(options = {}) #:doc:
0
+      def url_for(options = {})
0
+        options ||= {}
0
         case options
0
           when String
0
             options

0
@@ -63,17 +63,15 @@ module ActionView
0
       #   # calls @workshop.to_s
0
       #   # => /workshops/5
0
       def url_for(options = {})
0
+        options ||= {}
0
         case options
0
         when Hash
0
-          show_path =  options[:host].nil? ? true : false
0
-          options = { :only_path => show_path }.update(options.symbolize_keys)
0
+          options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
0
           escape  = options.key?(:escape) ? options.delete(:escape) : true
0
           url     = @controller.send(:url_for, options)
0
         when String
0
           escape = true
0
           url    = options
0
-        when NilClass
0
-          url = @controller.send(:url_for, nil)
0
         else
0
           escape = false
0
           url    = polymorphic_path(options)

0
@@ -313,6 +313,10 @@ class UrlHelperWithControllerTest < ActionView::TestCase
0
       render :inline => "<%= show_named_route_#{params[:kind]} %>"
0
     end
0
 
0
+    def nil_url_for
0
+      render :inline => '<%= url_for(nil) %>'
0
+    end
0
+
0
     def rescue_action(e) raise e end
0
   end
0
 
0
@@ -329,7 +333,7 @@ class UrlHelperWithControllerTest < ActionView::TestCase
0
     assert_equal '/url_helper_with_controller/show_url_for', @response.body
0
   end
0
 
0
-  def test_named_route_shows_host_and_path
0
+  def test_named_route_url_shows_host_and_path
0
     with_url_helper_routing do
0
       get :show_named_route, :kind => 'url'
0
       assert_equal 'http://test.host/url_helper_with_controller/show_named_route', @response.body
0
@@ -343,6 +347,11 @@ class UrlHelperWithControllerTest < ActionView::TestCase
0
     end
0
   end
0
 
0
+  def test_url_for_nil_returns_current_path
0
+    get :nil_url_for
0
+    assert_equal '/url_helper_with_controller/nil_url_for', @response.body
0
+  end
0
+
0
   protected
0
     def with_url_helper_routing
0
       with_routing do |set|