(bug 18346) Automatically hide RC log items on block too

[lhc/web/wiklou.git] / includes / Sanitizer.php

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index a433ce0..5d58b03 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -59,9 +59,6 @@ define( 'MW_ATTRIBS_REGEX',
 /**
  * List of all named character entities defined in HTML 4.01
  * http://www.w3.org/TR/html4/sgml/entities.html
- * This list does *not* include ', which is part of XHTML
- * 1.0 but not HTML 4.01.  It is handled as a special case in
- * the code.
  * @private
  */
 global $wgHtmlEntities;
@@ -321,7 +318,6 @@ $wgHtmlEntities = array(
 
 /**
  * Character entity aliases accepted by MediaWiki
- * XXX: decodeEntity() assumes that all values in this array are valid keys to $wgHtmlEntities
  */
 global $wgHtmlEntityAliases;
 $wgHtmlEntityAliases = array(
@@ -951,7 +947,7 @@ class Sanitizer {
         * encoded text for an attribute value.
         *
         * See http://www.w3.org/TR/REC-xml/#AVNormalize for background,
-        * but note that we are not returning the value, but are returning
+        * but note that we're not returning the value, but are returning
         * XML source fragments that will be slapped into output.
         *
         * @param string $text
@@ -1029,8 +1025,6 @@ class Sanitizer {
                        return "&{$wgHtmlEntityAliases[$name]};";
                } elseif( isset( $wgHtmlEntities[$name] ) ) {
                        return "&$name;";
-               } elseif( $name == 'apos' ) {
-                       return "'";  // "'" is valid in XHTML, but not in HTML4
                } else {
                        return "&$name;";
                }
@@ -1132,8 +1126,6 @@ class Sanitizer {
                }
                if( isset( $wgHtmlEntities[$name] ) ) {
                        return codepointToUtf8( $wgHtmlEntities[$name] );
-               } elseif( $name == 'apos' ) {
-                       return "'";  // "'" is not in $wgHtmlEntities, but it's still valid XHTML
                } else {
                        return "&$name;";
                }