Merge pull request #2244 from jekyll/xml-escape-nil

jekyll · Apr 19, 2014 · 702d552 · 702d552
2 parents fa9c933 + 1e16ab4
commit 702d552
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
@@ -83,7 +83,7 @@ def date_to_rfc822(date)
     #
     # Returns the escaped String.
     def xml_escape(input)
-      CGI.escapeHTML(input)
+      CGI.escapeHTML(input.to_s)
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters

diff --git a/test/test_filters.rb b/test/test_filters.rb
@@ -93,6 +93,10 @@ def initialize(opts = {})
       assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
     end
 
+    should "not error when xml escaping nil" do
+      assert_equal "", @filter.xml_escape(nil)
+    end
+
     should "escape space as plus" do
       assert_equal "my+things", @filter.cgi_escape("my things")
     end