Download as
Browse Code »

Commit ae6f3cfe3b6499335c7b6ee1a6376885f42cca62

Authored by Rodrigo Souto
2 parents 0b77bbea 3ba4ed31
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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