Merge branch 'master' into openstreetbugs

[rails.git] / app / controllers / browse_controller.rb

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index cb866eb3f9e41089dd0e1b1c2f50af479c3efbc0..d9b18769c37b934d8f77038c5884ee23418c9fe3 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -95,11 +95,11 @@ private
     end
   rescue ActionView::TemplateError => ex
     if ex.original_exception.is_a?(Timeout::Error)
     end
   rescue ActionView::TemplateError => ex
     if ex.original_exception.is_a?(Timeout::Error)

-      render :action => "timeout", :status => :request_timeout
+      render :action => "timeout"

     else
       raise
     end
   rescue Timeout::Error
     else
       raise
     end
   rescue Timeout::Error

-    render :action => "timeout", :status => :request_timeout
+    render :action => "timeout"

   end
 end
   end
 end