Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e07b65af76502278deb69b98c62283bc76f20e39..0957853ce574cee1d900198be8aa45fd42b43359 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -16,7 +16,7 @@ class UserController < ApplicationController
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
-  cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
+  cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete], :unless => OSM_STATUS == :database_offline
 
   def terms
     @title = t 'user.new.title'
@@ -197,7 +197,8 @@ class UserController < ApplicationController
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
         flash.now[:error] = t 'user.login.account not active'
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :suspended => true)
-        flash.now[:error] = t 'user.login.account suspended'
+        webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
+        flash.now[:error] = t 'user.login.account suspended', :webmaster => webmaster
       else
         flash.now[:error] = t 'user.login.auth failure'
       end