(bug 20655) If $wgHtml5 is false, run attribute values through Sanitizer::encodeAttri...

diff --git a/includes/Html.php b/includes/Html.php
index bece509..1010fc3 100644 (file)
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -335,13 +335,17 @@ class Html {
                                # and we don't need <> escaped here, we may as well not call
                                # htmlspecialchars().  FIXME: verify that we actually need to
                                # escape \n\r\t here, and explain why, exactly.
-                               $ret .= " $key=$quote" . strtr( $value, array(
-                                       '&' => '&amp;',
-                                       '"' => '&quot;',
-                                       "\n" => '&#10;',
-                                       "\r" => '&#13;',
-                                       "\t" => '&#9;'
-                               ) ) . $quote;
+                               if ( $wgHtml5 ) {
+                                       $ret .= " $key=$quote" . strtr( $value, array(
+                                               '&' => '&amp;',
+                                               '"' => '&quot;',
+                                               "\n" => '&#10;',
+                                               "\r" => '&#13;',
+                                               "\t" => '&#9;'
+                                       ) ) . $quote;
+                               } else {
+                                       $ret .= " $key=$quote" . Sanitizer::encodeAttribute( $value ) . $quote;
+                               }
                        }
                }
                return $ret;