From 36c90f1dfd2123cf7dfbea7a9699bfcacb4e0aeb Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 4 Jul 2014 11:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E5=AD=A6=E6=A0=A1?= =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=8B=BFid=E7=9B=B4=E6=8E=A5=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 7c60e2dc3..9c72d301f 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -33,7 +33,7 @@ class WelcomeController < ApplicationController if params[:school_id] @school_id = params[:school_id] elsif User.current.logged? && User.current.user_extensions.school - @school_id = User.current.user_extensions.school.id + @school_id = User.current.user_extensions.school.try(:id) end @logoLink ||= logolink() end