From bd9bbf38071f1a4572a95009987b0b50165eb2c7 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Fri, 11 Apr 2014 18:51:23 +0000 Subject: [PATCH] [template-welcome-page] Avoid crash on welcome page when there is no template --- app/controllers/public/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb index e34e754..ba9ecbd 100644 --- a/app/controllers/public/home_controller.rb +++ b/app/controllers/public/home_controller.rb @@ -21,8 +21,8 @@ class HomeController < PublicController def welcome self.class.no_design_blocks @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation) - @person_template = Person.find(params[:template_id]) - @template_welcome_page = @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil + @person_template = user && user.template || params[:template_id] && Person.find(params[:template_id]) + @template_welcome_page = @person_template && @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil end end -- libgit2 0.21.2