Download as
Browse Code »

Commit ae6f3cfe3b6499335c7b6ee1a6376885f42cca62

Authored by Rodrigo Souto
2 parents 0b77bbea 3ba4ed31
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 commit 'refs/merge-requests/330' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/330
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @ae6f3cf
@@ -589,7 +589,7 @@ class Article < ActiveRecord::Base @@ -589,7 +589,7 @@ class Article < ActiveRecord::Base
589 end 589 end
590 590
591 def lead 591 def lead
592 - abstract.blank? ? first_paragraph : abstract 592 + abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
593 end 593 end
594 594
595 def short_lead 595 def short_lead