options should always be passed to url_for

Author: tenderlove

actionpack/lib/action_dispatch/routing/route_set.rb

@@ -645,9 +645,9 @@ def _generate_prefix(options = {})
         nil
       end
 
-      # The +options+ argument must be +nil+ or a hash whose keys are *symbols*.
+      # The +options+ argument must be a hash whose keys are *symbols*.
       def url_for(options)
-        options = default_url_options.merge(options || {})
+        options = default_url_options.merge options
 
         user = password = nil