Download as
Browse Code »

Commit 2a82af5f6fc1e2e3558ffae3f922145c59b30c8d

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

Reverting c0f97fc83 since it breaks the admin features panel

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @2a82af5
@@ -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',