Download as
Browse Code »

Commit 2508aeedee2ca744ddeb139d1b2e3436149404f8

Authored by Joenio Costa
1 parent 8f1693a8
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

Prevent crash when looking for lead in article without paragraphs 

(ActionItem1670)
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @2508aee
... ... @@ -342,7 +342,8 @@ class Article < ActiveRecord::Base
342 342 end
343 343  
344 344 def first_paragraph
345   - Hpricot(to_html).search('p').first.to_html
  345 + paragraphs = Hpricot(to_html).search('p')
  346 + paragraphs.empty? ? '' : paragraphs.first.to_html
346 347 end
347 348  
348 349 def lead
... ...
test/unit/article_test.rb
  Diff comments   View file @2508aee
... ... @@ -913,4 +913,9 @@ class ArticleTest < Test::Unit::TestCase
913 913 assert_equal '<p>first</p>', a.lead
914 914 end
915 915  
  916 + should 'return blank as lead when article has no paragraphs' do
  917 + a = Article.new(:body => "<div>an article with content <em>but without</em> a paragraph</div>")
  918 + assert_equal '', a.lead
  919 + end
  920 +
916 921 end
... ...