Download as
Browse Code »

Commit 440535cf852b1fc56f51327842caa9236905ad7d

Authored by Rodrigo Souto
1 parent 25018e09
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

convert-macro: unescaping html converted by macros

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @440535c
@@ -1391,7 +1391,7 @@ module ApplicationHelper @@ -1391,7 +1391,7 @@ module ApplicationHelper
1391 result = @plugins.parse_macro(macro_name, macro, source) 1391 result = @plugins.parse_macro(macro_name, macro, source)
1392 macro.content = result.kind_of?(Proc) ? self.instance_eval(&result) : result 1392 macro.content = result.kind_of?(Proc) ? self.instance_eval(&result) : result
1393 end 1393 end
1394 - doc.xpath('//body/*').to_s 1394 + CGI.unescapeHTML(doc.xpath('//body/*').to_s)
1395 end 1395 end
1396 1396
1397 def default_folder_for_image_upload(profile) 1397 def default_folder_for_image_upload(profile)