Download as
Browse Code »

Commit 9d28f15ab1787d65a6b8c56b705eba514d5a13e0

Authored by Antonio Terceiro
2 parents fd4c6709 4585f58a
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable'

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @9d28f15
@@ -533,7 +533,7 @@ private :generate_url, :url_options @@ -533,7 +533,7 @@ private :generate_url, :url_options
533 end 533 end
534 534
535 def custom_header 535 def custom_header
536 - self[:custom_header] || environment.custom_header 536 + self[:custom_header] || environment && environment.custom_header
537 end 537 end
538 538
539 def custom_header_expanded 539 def custom_header_expanded
@@ -549,7 +549,7 @@ private :generate_url, :url_options @@ -549,7 +549,7 @@ private :generate_url, :url_options
549 end 549 end
550 550
551 def custom_footer 551 def custom_footer
552 - self[:custom_footer] || environment.custom_footer 552 + self[:custom_footer] || environment && environment.custom_footer
553 end 553 end
554 554
555 def custom_footer_expanded 555 def custom_footer_expanded
test/unit/profile_test.rb
  Diff comments   View file @9d28f15
@@ -851,7 +851,7 @@ class ProfileTest < Test::Unit::TestCase @@ -851,7 +851,7 @@ class ProfileTest < Test::Unit::TestCase
851 profile = Profile.new 851 profile = Profile.new
852 env = mock 852 env = mock
853 env.expects(:custom_header).returns('environment header') 853 env.expects(:custom_header).returns('environment header')
854 - profile.expects(:environment).returns(env) 854 + profile.stubs(:environment).returns(env)
855 855
856 assert_equal 'environment header', profile.custom_header 856 assert_equal 'environment header', profile.custom_header
857 end 857 end
@@ -860,7 +860,7 @@ class ProfileTest < Test::Unit::TestCase @@ -860,7 +860,7 @@ class ProfileTest < Test::Unit::TestCase
860 profile = Profile.new 860 profile = Profile.new
861 env = mock 861 env = mock
862 env.expects(:custom_footer).returns('environment footer') 862 env.expects(:custom_footer).returns('environment footer')
863 - profile.expects(:environment).returns(env) 863 + profile.stubs(:environment).returns(env)
864 864
865 assert_equal 'environment footer', profile.custom_footer 865 assert_equal 'environment footer', profile.custom_footer
866 end 866 end