2
Download as
Browse Code »

Commit 3c94729bc1231c1a23209fc6ca3aeaed5a29534d

Authored by Braulio Bhavamitra
1 parent da84575e
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

plugins: revert change on pipeline

Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
lib/noosfero/plugin/manager.rb
  Diff comments   View file @3c94729
@@ -24,7 +24,7 @@ class Noosfero::Plugin::Manager @@ -24,7 +24,7 @@ class Noosfero::Plugin::Manager
24 end 24 end
25 25
26 def fetch_plugins(event, *args) 26 def fetch_plugins(event, *args)
27 - map { |plugin| plugin.class if result_for plugin, event, *args }.compact.flatten 27 + flat_map{ |plugin| plugin.class if result_for plugin, event, *args }.compact
28 end 28 end
29 29
30 def dispatch_without_flatten(event, *args) 30 def dispatch_without_flatten(event, *args)
@@ -60,7 +60,8 @@ class Noosfero::Plugin::Manager @@ -60,7 +60,8 @@ class Noosfero::Plugin::Manager
60 60
61 def pipeline(event, *args) 61 def pipeline(event, *args)
62 each do |plugin| 62 each do |plugin|
63 - result = result_for plugin, event, *args 63 + # result_for can't be used here and default must be returned to keep args
  64 + result = plugin.send event, *args
64 result = result.kind_of?(Array) ? result : [result] 65 result = result.kind_of?(Array) ? result : [result]
65 raise ArgumentError, "Pipeline broken by #{plugin.class.name} on #{event} with #{result.length} arguments instead of #{args.length}." if result.length != args.length 66 raise ArgumentError, "Pipeline broken by #{plugin.class.name} on #{event} with #{result.length} arguments instead of #{args.length}." if result.length != args.length
66 args = result 67 args = result