Download as
Browse Code »

Commit 1843b53fbdfd7fd7b864faf37fdc6836c6fc5ce5

Authored by Antonio Terceiro
1 parent aa19a891
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

filter_html: fix crash on nil input

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @1843b53
... ... @@ -1377,7 +1377,7 @@ module ApplicationHelper
1377 1377 # are old things that do not support it we are keeping this hot spot.
1378 1378 html = @plugins.pipeline(:parse_content, html, source).first
1379 1379 end
1380   - html.html_safe
  1380 + html && html.html_safe
1381 1381 end
1382 1382  
1383 1383 def convert_macro(html, source)
... ...