Download as
Browse Code »

Commit 440535cf852b1fc56f51327842caa9236905ad7d

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

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)