fix interplay of humanize and html_escape

activesupport/lib/active_support/inflector/methods.rb

@@ -117,7 +117,7 @@ def humanize(lower_case_and_underscored_word, options = {})
       result.gsub!(/([a-z\d]*)/i) { |match|
         "#{inflections.acronyms[match] || match.downcase}"
       }
-      result.gsub!(/^\w/) { $&.upcase } if options.fetch(:capitalize, true)
+      result.gsub!(/^\w/) { |match| match.upcase } if options.fetch(:capitalize, true)
       result
     end
 

activesupport/test/core_ext/string_ext_test.rb

@@ -161,6 +161,10 @@ def test_humanize_without_capitalize
     end
   end
 
+  def test_humanize_with_html_escape
+    assert_equal 'Hello', ERB::Util.html_escape("hello").humanize
+  end
+
   def test_ord
     assert_equal 97, 'a'.ord
     assert_equal 97, 'abc'.ord