always rewrite_relative_url_root

rails · Sep 13, 2011 · 5bad79d · 5bad79d
1 parent f1c3903
commit 5bad79d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
@@ -27,7 +27,7 @@ def compute_public_path(source, dir, ext = nil, include_host = true, protocol =
 
       source = rewrite_extension(source, dir, ext) if ext
       source = rewrite_asset_path(source, dir)
-      source = rewrite_relative_url_root(source, relative_url_root) if has_request?
+      source = rewrite_relative_url_root(source, relative_url_root)
       source = rewrite_host_and_protocol(source, protocol) if include_host
       source
     end

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -103,11 +103,7 @@ class AssetPaths < ::ActionView::AssetPaths #:nodoc:
         class AssetNotPrecompiledError < StandardError; end
 
         def compute_public_path(source, dir, ext = nil, include_host = true, protocol = nil)
-          public_path = super(source, asset_prefix, ext, include_host, protocol)
-          if !is_uri?(public_path) && relative_url_root
-            public_path = rewrite_relative_url_root(public_path, relative_url_root)
-          end
-          public_path
+          super(source, asset_prefix, ext, include_host, protocol)
         end
 
         # Return the filesystem path for the source