0
@@ -606,8 +606,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 = nil) #:doc:
0
-        case options || {}
0
+      def url_for(options = {}) #:doc:
0
+        case options
0
           when String
0
             options
0
           when Hash

0
@@ -169,6 +169,22 @@ class DefaultUrlOptionsTest < Test::Unit::TestCase
0
   end
0
 end
0
 
0
+class EmptyUrlOptionsTest < Test::Unit::TestCase
0
+  def setup
0
+    @controller = NonEmptyController.new
0
+
0
+    @request    = ActionController::TestRequest.new
0
+    @response   = ActionController::TestResponse.new
0
+
0
+    @request.host = 'www.example.com'
0
+  end
0
+
0
+  def test_ensure_url_for_works_as_expected_when_called_with_no_options_if_default_url_options_is_not_set
0
+    get :public_action
0
+    assert_equal "http://www.example.com/non_empty/public_action", @controller.url_for
0
+  end
0
+end
0
+
0
 class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
0
   def test_named_routes_still_work
0
     ActionController::Routing::Routes.draw do |map|
0
@@ -180,4 +196,4 @@ class EnsureNamedRoutesWorksTicket22BugTest < Test::Unit::TestCase
0
   ensure
0
     ActionController::Routing::Routes.load!
0
   end
0
-end
0
\ No newline at end of file
0
+end