More bug 671: whitelist <kbd> and <samp> for user input. Followup per r70164's comment.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ad5e6f..f3f0848 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -138,7 +138,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   because it encourages edits to be marked minor accidentally and it can be
   easily replicated by custom user scripts for those who really want it.
 * Non-file pages can no longer be moved to the file namespace, nor vice versa.
-* (bug 671) The <dfn> element has been whitelisted in user input.
+* (bug 671) The <dfn>, <kbd> and <samp> elements have been whitelisted in user input
 * (bug 24563) Entries on Special:WhatLinksHere now have a link to their history
 * (bug 21503) There's now a "reason" field when creating account for other users
 * (bug 24418) action=markpatrolled now requires a token

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 7fdd1df..ea36f25 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -368,7 +368,8 @@ class Sanitizer {
                                'h2', 'h3', 'h4', 'h5', 'h6', 'cite', 'code', 'em', 's',
                                'strike', 'strong', 'tt', 'var', 'div', 'center',
                                'blockquote', 'ol', 'ul', 'dl', 'table', 'caption', 'pre',
-                               'ruby', 'rt' , 'rb' , 'rp', 'p', 'span', 'u', 'abbr', 'dfn'
+                               'ruby', 'rt' , 'rb' , 'rp', 'p', 'span', 'u', 'abbr', 'dfn',
+                               'kbd', 'samp'
                        );
                        $htmlsingle = array(
                                'br', 'hr', 'li', 'dt', 'dd'