X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/841ebe80d7e62068e8c2813bbeb82ecfbfeb0607..1ae014afa1e9cb79abea820610beea1bcf66b99c:/app/controllers/browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 5c7912d15..a511d67d3 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -84,7 +84,13 @@ private
     SystemTimer.timeout_after(30) do
       yield
     end
+  rescue ActionView::TemplateError => ex
+    if ex.original_exception.is_a?(Timeout::Error)
+      render :action => "timeout"
+    else
+      raise
+    end
   rescue Timeout::Error
-    render :action => "timeout", :status => :request_timeout
+    render :action => "timeout"
   end
 end