Merge "HtmlFormatter::filterContent() should always return an array"

diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index 96ffe9e..83d0530 100644 (file)
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -138,7 +138,7 @@ class HtmlFormatter {
 
                if ( !$removals ) {
                        wfProfileOut( __METHOD__ );
-                       return;
+                       return array();
                }
 
                $doc = $this->getDoc();