Download as
Browse Code »

Commit a4458d702c41a5b609f56ed10e4076d9c84ba181

Authored by Braulio Bhavamitra
Committed by Rodrigo Souto
1 parent 1cf37958
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

Use instance_eval instead of content.call on plugins' dispatch 

ActionItem3098
Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @a4458d7
@@ -34,8 +34,8 @@ @@ -34,8 +34,8 @@
34 <%# Add custom tags/styles/etc via content_for %> 34 <%# Add custom tags/styles/etc via content_for %>
35 <%= yield :head %> 35 <%= yield :head %>
36 <%= 36 <%=
37 - @plugins.dispatch(:head_ending).collect do |content|  
38 - content.respond_to?(:call) ? content.call : content 37 + @plugins.dispatch(:head_ending).map do |content|
  38 + if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
39 end.join("\n") 39 end.join("\n")
40 %> 40 %>
41 41
@@ -47,8 +47,8 @@ @@ -47,8 +47,8 @@
47 <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a> 47 <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
48 48
49 <%= 49 <%=
50 - @plugins.dispatch(:body_beginning).collect do |content|  
51 - content.respond_to?(:call) ? content.call : content 50 + @plugins.dispatch(:body_beginning).map do |content|
  51 + if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
52 end.join("\n") 52 end.join("\n")
53 %> 53 %>
54 54
app/views/profile_editor/edit.rhtml
  Diff comments   View file @a4458d7
@@ -52,8 +52,8 @@ @@ -52,8 +52,8 @@
52 )%> 52 )%>
53 53
54 <%= 54 <%=
55 - @plugins.dispatch(:profile_editor_extras).each do |content|  
56 - content.respond_to?(:call) ? content.call : content 55 + @plugins.dispatch(:profile_editor_extras).map do |content|
  56 + if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
57 end.join("\n") 57 end.join("\n")
58 %> 58 %>
59 59