Download as
Browse Code »

Commit d4933c60819f204e661e232c0d244ffba09d50d0

Authored by Antonio Terceiro
1 parent 35fba789
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

ActionItem866: removing code duplication

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @d4933c6
... ... @@ -465,7 +465,7 @@ class Profile < ActiveRecord::Base
465 465 end
466 466  
467 467 def custom_header_expanded
468   - header = self[:custom_header] || environment.custom_header
  468 + header = custom_header
469 469 if header
470 470 if self.respond_to?(:name) && header.include?('{name}')
471 471 header.gsub('{name}', self.name)
... ... @@ -480,7 +480,7 @@ class Profile < ActiveRecord::Base
480 480 end
481 481  
482 482 def custom_footer_expanded
483   - footer = self[:custom_footer] || environment.custom_footer
  483 + footer = custom_footer
484 484 if footer
485 485 %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do |att|
486 486 if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
... ...