X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f3219ada148505d3f6f7a4acdf3376d80576b3bb..32c3000af7c2c4016b75abf5a396262e28aabd72:/app/controllers/application_controller.rb?ds=sidebyside

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 009984594..a2211ea69 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,6 +12,7 @@ class ApplicationController < ActionController::Base
   attr_accessor :current_user
 
   helper_method :current_user
+  helper_method :preferred_langauges
 
   private
 
@@ -234,7 +235,7 @@ class ApplicationController < ActionController::Base
     e = e.cause
 
     if e.is_a?(Timeout::Error) ||
-       (e.is_a?(ActiveRecord::StatementInvalid) && e.message =~ /execution expired/)
+       (e.is_a?(ActiveRecord::StatementInvalid) && e.message.include?("execution expired"))
       render :action => "timeout"
     else
       raise