Merge branch 'master' into openid

[rails.git] / vendor / plugins / file_column / lib / file_column_helper.rb

diff --git a/vendor/plugins/file_column/lib/file_column_helper.rb b/vendor/plugins/file_column/lib/file_column_helper.rb
index f4ebe38e7e9a3ea64c5a8a346559a551c92b1a1e..8c50053a3bf77dcde47183ae4ec99a05df30b2c1 100644 (file)
--- a/vendor/plugins/file_column/lib/file_column_helper.rb
+++ b/vendor/plugins/file_column/lib/file_column_helper.rb
@@ -76,7 +76,7 @@ module FileColumnHelper
     return nil unless relative_path
 
     url = ""
-    url << request.relative_url_root.to_s if absolute
+    url << request.protocol << request.host_with_port if absolute
     url << "/"
     url << object.send("#{method}_options")[:base_url] << "/"
     url << relative_path