Use the relative_url_root when generating asset_paths. #3935

Contributed by Daniel S from Redmine.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4094 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
index 9fd1742..a4a9266 100644 (file)
--- a/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
@@ -109,11 +109,11 @@ module Engines::RailsExtensions::AssetHelpers
   # Returns the publicly-addressable relative URI for the given asset, type and plugin
   def self.plugin_asset_path(plugin_name, type, asset)
     raise "No plugin called '#{plugin_name}' - please use the full name of a loaded plugin." if Engines.plugins[plugin_name].nil?
-    "/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
+    "#{ActionController::Base.relative_url_root}/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
   end
   
 end
 
 module ::ActionView::Helpers::AssetTagHelper #:nodoc:
   include Engines::RailsExtensions::AssetHelpers
-end
\ No newline at end of file
+end