lib/rails_ext/action_controller/micelaneous.rb in rails-ext-0.3.23 vs lib/rails_ext/action_controller/micelaneous.rb in rails-ext-0.3.24

@@ -52,10 +52,12 @@
       to_delete.each{|k| options.delete k}
       
       host = options.delete(:host) || options.delete('host')
       port = options.delete(:port) || options.delete('port')
       
-      url << "?#{options.to_query}" unless options.empty?
+      delimiter = path.include?('?') ? '&' : '?'
+      
+      url << "#{delimiter}#{options.to_query}" unless options.empty?
       url._url_format = options[:format] if options[:format] # hack for links with ajax support
       url
       
       if host.blank?
         url
\ No newline at end of file