Download as
Browse Code »

Commit fca8659a89d9a7d460c0597b326eaabdc8fe81f4

Authored by Rodrigo Souto
2 parents e7aa3273 c95a33e7
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

Merge branch 'stable'

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @fca8659
@@ -100,7 +100,9 @@ module BoxesHelper @@ -100,7 +100,9 @@ module BoxesHelper
100 options[:title] = _("This block is invisible. Your visitors will not see it.") 100 options[:title] = _("This block is invisible. Your visitors will not see it.")
101 end 101 end
102 102
103 - result = filter_html(result, block) 103 + if @controller.send(:content_editor?)
  104 + result = filter_html(result, block)
  105 + end
104 106
105 box_decorator.block_target(block.box, block) + 107 box_decorator.block_target(block.box, block) +
106 content_tag('div', 108 content_tag('div',