Merge branch 'develop' into cache-foi-attachments-seb

Conflicts:
	app/controllers/request_controller.rb

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