Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 5 insertions, 4 deletions

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 80deb73bbb..49ec5c7fba 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -35,10 +35,10 @@ module Rails
     def load_paths
       report_nonexistant_or_empty_plugin! unless valid?
       
-      returning [] do |load_paths|
-        load_paths << lib_path  if has_lib_directory?
-        load_paths << app_paths if has_app_directory?
-      end.flatten
+      load_paths = []
+      load_paths << lib_path  if has_lib_directory?
+      load_paths << app_paths if has_app_directory?
+      load_paths.flatten
     end
     
     # Evaluates a plugin's init.rb file.
@@ -139,6 +139,7 @@ module Rails
 
       def evaluate_init_rb(initializer)
         if has_init_file?
+          require 'active_support/core_ext/kernel/reporting'
           silence_warnings do
             # Allow plugins to reference the current configuration object
             config = initializer.configuration