github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3000 from guilleiguaran/fix-relative-url-root

Browse Source 
Fix for relative url root in assets
This commit is contained in:
Santiago Pastorino
2011-09-13 02:29:33 -07:00
parent 536bb7b135 f509b6988b
commit 8a005ff504
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/sprockets/helpers/rails_helper.rb
View File

@@ -17,7 +17,6 @@ module Sprockets
paths.asset_digests = asset_digests
paths.compile_assets = compile_assets?
paths.digest_assets = digest_assets?
paths.relative_url_root = config.action_controller.relative_url_root
paths
end
end
@@ -97,8 +96,7 @@ module Sprockets
end
class AssetPaths < ::ActionView::AssetPaths #:nodoc:
attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets,
:digest_assets, :relative_url_root
attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets
class AssetNotPrecompiledError < StandardError; end
@@ -153,7 +151,7 @@ module Sprockets
end
def relative_url_root
has_request? ? super : @relative_url_root
has_request? ? super : config.action_controller.relative_url_root
end
end
end