Download as
Browse Code »

Commit 4585f58a55387022d3d01945a74007eaa646cd09

Authored by Antonio Terceiro
1 parent 78f01eb3
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem1245: don't crash before having an environment

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @4585f58
... ... @@ -540,7 +540,7 @@ private :generate_url, :url_options
540 540 end
541 541  
542 542 def custom_header
543   - self[:custom_header] || environment.custom_header
  543 + self[:custom_header] || environment && environment.custom_header
544 544 end
545 545  
546 546 def custom_header_expanded
... ... @@ -556,7 +556,7 @@ private :generate_url, :url_options
556 556 end
557 557  
558 558 def custom_footer
559   - self[:custom_footer] || environment.custom_footer
  559 + self[:custom_footer] || environment && environment.custom_footer
560 560 end
561 561  
562 562 def custom_footer_expanded
... ...
test/unit/profile_test.rb
  Diff comments   View file @4585f58
... ... @@ -851,7 +851,7 @@ class ProfileTest < Test::Unit::TestCase
851 851 profile = Profile.new
852 852 env = mock
853 853 env.expects(:custom_header).returns('environment header')
854   - profile.expects(:environment).returns(env)
  854 + profile.stubs(:environment).returns(env)
855 855  
856 856 assert_equal 'environment header', profile.custom_header
857 857 end
... ... @@ -860,7 +860,7 @@ class ProfileTest < Test::Unit::TestCase
860 860 profile = Profile.new
861 861 env = mock
862 862 env.expects(:custom_footer).returns('environment footer')
863   - profile.expects(:environment).returns(env)
  863 + profile.stubs(:environment).returns(env)
864 864  
865 865 assert_equal 'environment footer', profile.custom_footer
866 866 end
... ...