diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 04:06:31 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-20 04:06:31 +0000 |
| commit | b35bc6d93c972b4fb51dca35d310f3c4b7c43a30 (patch) | |
| tree | e7ede5d68045e14ec7ab06512ec5add93de80613 | |
| parent | 4593d97472c741293eca9604cd571ce18d7199b2 (diff) | |
| download | redmine-b35bc6d93c972b4fb51dca35d310f3c4b7c43a30.tar.gz redmine-b35bc6d93c972b4fb51dca35d310f3c4b7c43a30.zip | |
Merged r4094 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4153 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 9fd1742c4..a4a9266f2 100644 --- 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 |