Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_controller/cookies.rb
	actionpack/lib/action_controller/streaming.rb
	actionpack/lib/action_controller/test_case.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/helpers/date_helper.rb
	actionpack/lib/action_view/helpers/debug_helper.rb
	actionpack/lib/action_view/helpers/form_options_helper.rb
	actionpack/lib/action_view/helpers/javascript_helper.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/validations.rb
	activeresource/README
	activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
	activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb
	activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb
	railties/doc/guides/actionview/helpers.markdown
	railties/doc/guides/actionview/partials.markdown
	railties/doc/guides/activerecord/basics.markdown

1 files changed, 3 insertions, 3 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 5a71935009..a43296461b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,7 +426,8 @@ module ActionMailer #:nodoc:
       end
 
       def template_root=(root)
-        write_inheritable_attribute(:template_root, ActionView::PathSet.new(Array(root)))
+        root = ActionView::PathSet::Path.new(root) if root.is_a?(String)
+        write_inheritable_attribute(:template_root, root)
       end
     end
 
@@ -529,7 +530,7 @@ module ActionMailer #:nodoc:
       end
 
       def render_message(method_name, body)
-        render :file => method_name, :body => body, :use_full_path => true
+        render :file => method_name, :body => body
       end
 
       def render(opts)
@@ -537,7 +538,6 @@ module ActionMailer #:nodoc:
         if opts[:file] && opts[:file] !~ /\//
           opts[:file] = "#{mailer_name}/#{opts[:file]}"
         end
-        opts[:use_full_path] = true
         initialize_template_class(body).render(opts)
       end