3 files changed, 9 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 17fe7dc1b4..0bb08cd7ff 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -785,7 +785,7 @@ module ActionView
       # Returns an input tag of the "password" type tailored for accessing a specified attribute (identified by +method+) on an object
       # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
       # hash with +options+. These options will be tagged onto the HTML as an HTML element attribute as in the example
-      # shown.
+      # shown. For security reasons this field is blank by default; pass in a value via +options+ if this is not desired.
       #
       # ==== Examples
       #   password_field(:login, :pass, :size => 20)
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index af367ac28d..76f4dea7b8 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -149,7 +149,7 @@ module ActionView
       # as well as incorrectly putting part of the path in the template
       # name instead of the prefix.
       def normalize_name(name, prefixes) #:nodoc:
-        prefixes = nil if prefixes.blank?
+        prefixes = prefixes.presence
         parts    = name.to_s.split('/')
         parts.shift if parts.first.empty?
         name     = parts.pop
diff --git a/actionpack/lib/action_view/template/handlers.rb b/actionpack/lib/action_view/template/handlers.rb
index 52e032bbd8..d9cddc0040 100644
--- a/actionpack/lib/action_view/template/handlers.rb
+++ b/actionpack/lib/action_view/template/handlers.rb
@@ -10,7 +10,7 @@ module ActionView #:nodoc:
         base.register_default_template_handler :erb, ERB.new
         base.register_template_handler :builder, Builder.new
         base.register_template_handler :raw, Raw.new
-        base.register_template_handler :rb, :source.to_proc
+        base.register_template_handler :ruby, :source.to_proc
       end
 
       @@template_handlers = {}
@@ -21,11 +21,14 @@ module ActionView #:nodoc:
       end
 
       # Register an object that knows how to handle template files with the given
-      # extension. This can be used to implement new template types.
+      # extensions. This can be used to implement new template types.
       # The handler must respond to `:call`, which will be passed the template
       # and should return the rendered template as a String.
-      def register_template_handler(extension, handler)
-        @@template_handlers[extension.to_sym] = handler
+      def register_template_handler(*extensions, handler)
+        raise(ArgumentError, "Extension is required") if extensions.empty?
+        extensions.each do |extension|
+          @@template_handlers[extension.to_sym] = handler
+        end
         @@template_extensions = nil
       end