Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 68359585e0eeb60d64c498a64b965af5791e87f4..1c27cb4d5e3ce3c9d752d805dcfe63952c99e50d 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