Download as
Browse Code »

Commit f42c96a7d74eed939162ac46a579c3e50aad454c

Authored by Antonio Terceiro
2 parents 018ff85e 2aed0d5e
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 'ai3294' into 'master' 

Fix path and init loading order to be as in noosfero-rails2

http://noosfero.org/Development/ActionItem3294

See merge request !311
Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
lib/noosfero/plugin.rb
  Diff comments   View file @f42c96a
@@ -62,10 +62,12 @@ class Noosfero::Plugin @@ -62,10 +62,12 @@ class Noosfero::Plugin
62 path << File.join(dir, 'lib') 62 path << File.join(dir, 'lib')
63 # load vendor/plugins 63 # load vendor/plugins
64 Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin| 64 Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
65 - path << "#{vendor_plugin}/lib"  
66 - init = "#{vendor_plugin}/init.rb"  
67 - require init.gsub(/.rb$/, '') if File.file? init  
68 - end 65 + path << "#{vendor_plugin}/lib"
  66 + end
  67 + end
  68 + Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
  69 + init = "#{vendor_plugin}/init.rb"
  70 + require init.gsub(/.rb$/, '') if File.file? init
69 end 71 end
70 72
71 # add view path 73 # add view path