diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-12-21 16:46:29 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-12-21 16:46:29 +0000 |
commit | 7ed887f0989425d9e412890800df05637b08c025 (patch) | |
tree | 6f1d3fb4d215f069995634907f2bb32e9220ac22 /app/helpers/link_to_helper.rb | |
parent | 21f1855560daa7992b058403938655ad229e0f71 (diff) | |
parent | 37b2fb482d31f77865bb889c049450d72876df92 (diff) |
Merge branch 'cache-foi-attachments-seb'
Diffstat (limited to 'app/helpers/link_to_helper.rb')
-rwxr-xr-x | app/helpers/link_to_helper.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 54b8d69d0..5866c31f0 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -185,9 +185,16 @@ module LinkToHelper end - def main_url(relative_path) + def main_url(relative_path, append = nil) url_prefix = "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000') - return url_prefix + relative_path + url = url_prefix + relative_path + if !append.nil? + env = Rack::MockRequest.env_for(url) + req = Rack::Request.new(env) + req.path_info += append + url = req.url + end + return url end # Basic date format |