From ef686a60951342a189cc82bfc4823180a6cf3a32 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 12 Jun 2014 11:45:10 -0700
Subject: [PATCH] add both branches to the only_path conditional

---
 actionpack/lib/action_dispatch/http/url.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index a5858758c6..3997c6ee98 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -36,13 +36,13 @@ def url_for(options)
           path  = options[:script_name].to_s.chomp("/")
           path << options[:path].to_s
 
-          add_trailing_slash(path) if options[:trailing_slash]
+          path = add_trailing_slash(path) if options[:trailing_slash]
 
-          result = path
-
-          unless options[:only_path]
-            result.prepend build_host_url(options)
-          end
+          result = if options[:only_path]
+                     path
+                   else
+                     build_host_url(options).concat path
+                   end
 
           if options.key? :params
             params = options[:params].is_a?(Hash) ?
-- 
GitLab