Merge "HtmlArmor: Pass ENT_QUOTES to htmlspecialchars()"

diff --git a/includes/libs/HtmlArmor.php b/includes/libs/HtmlArmor.php
index 511e1c9..4ba1bc3 100644 (file)
--- a/includes/libs/HtmlArmor.php
+++ b/includes/libs/HtmlArmor.php
@@ -50,7 +50,7 @@ class HtmlArmor {
                if ( $input instanceof HtmlArmor ) {
                        return $input->value;
                } else {
-                       return htmlspecialchars( $input );
+                       return htmlspecialchars( $input, ENT_QUOTES );
                }
        }
 }