Disable the query cache.

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7570fd82a072d2af2d2e70dd0e33cd2d83df391d..ce13a6aa3a6ae625407d3ac7fe2eaa11f7ab6ed9 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
 
   def authorize_web
     if session[:user]
-      @user = User.find(session[:user])
+      @user = User.find(session[:user], :conditions => "visible = 1")
     elsif session[:token]
       @user = User.authenticate(:token => session[:token])
       session[:user] = @user.id
@@ -43,8 +43,8 @@ class ApplicationController < ActionController::Base
     end 
   end 
 
-  def check_database_availability
-    if OSM_STATUS == :database_offline
+  def check_database_availability(need_api = false)
+    if OSM_STATUS == :database_offline or (need_api and OSM_STATUS == :api_offline)
       redirect_to :controller => 'site', :action => 'offline'
     end
   end