Download as
Browse Code »

Commit bd9bbf38071f1a4572a95009987b0b50165eb2c7

Authored by Rodrigo Souto
1 parent 852b5dff
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

[template-welcome-page] Avoid crash on welcome page when there is no template

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/controllers/public/home_controller.rb
  Diff comments   View file @bd9bbf3
... ... @@ -21,8 +21,8 @@ class HomeController < PublicController
21 21 def welcome
22 22 self.class.no_design_blocks
23 23 @display_confirmation_tips = !user.present? && !environment.enabled?(:skip_new_user_email_confirmation)
24   - @person_template = Person.find(params[:template_id])
25   - @template_welcome_page = @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil
  24 + @person_template = user && user.template || params[:template_id] && Person.find(params[:template_id])
  25 + @template_welcome_page = @person_template && @person_template.welcome_page && @person_template.welcome_page.published ? @person_template.welcome_page.body : nil
26 26 end
27 27  
28 28 end
... ...