Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5

1 files changed, 8 insertions, 4 deletions

diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 5866c31f0..7903dee2a 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -189,10 +189,14 @@ module LinkToHelper
         url_prefix = "http://" + MySociety::Config.get("DOMAIN", '127.0.0.1:3000')
         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
+            begin
+                env = Rack::MockRequest.env_for(url)
+                req = Rack::Request.new(env)
+                req.path_info += append
+                url = req.url
+            rescue URI::InvalidURIError
+                # don't append to it
+            end
         end
         return url
     end