| Index: trunk/phase3/includes/Sanitizer.php |
| — | — | @@ -59,9 +59,6 @@ |
| 60 | 60 | /** |
| 61 | 61 | * List of all named character entities defined in HTML 4.01 |
| 62 | 62 | * http://www.w3.org/TR/html4/sgml/entities.html |
| 63 | | - * This list does *not* include ', which is part of XHTML |
| 64 | | - * 1.0 but not HTML 4.01. It is handled as a special case in |
| 65 | | - * the code. |
| 66 | 63 | * @private |
| 67 | 64 | */ |
| 68 | 65 | global $wgHtmlEntities; |
| — | — | @@ -321,7 +318,6 @@ |
| 322 | 319 | |
| 323 | 320 | /** |
| 324 | 321 | * Character entity aliases accepted by MediaWiki |
| 325 | | - * XXX: decodeEntity() assumes that all values in this array are valid keys to $wgHtmlEntities |
| 326 | 322 | */ |
| 327 | 323 | global $wgHtmlEntityAliases; |
| 328 | 324 | $wgHtmlEntityAliases = array( |
| — | — | @@ -951,7 +947,7 @@ |
| 952 | 948 | * encoded text for an attribute value. |
| 953 | 949 | * |
| 954 | 950 | * See http://www.w3.org/TR/REC-xml/#AVNormalize for background, |
| 955 | | - * but note that we are not returning the value, but are returning |
| | 951 | + * but note that we're not returning the value, but are returning |
| 956 | 952 | * XML source fragments that will be slapped into output. |
| 957 | 953 | * |
| 958 | 954 | * @param string $text |
| — | — | @@ -1029,8 +1025,6 @@ |
| 1030 | 1026 | return "&{$wgHtmlEntityAliases[$name]};"; |
| 1031 | 1027 | } elseif( isset( $wgHtmlEntities[$name] ) ) { |
| 1032 | 1028 | return "&$name;"; |
| 1033 | | - } elseif( $name == 'apos' ) { |
| 1034 | | - return "'"; // "'" is valid in XHTML, but not in HTML4 |
| 1035 | 1029 | } else { |
| 1036 | 1030 | return "&$name;"; |
| 1037 | 1031 | } |
| — | — | @@ -1132,8 +1126,6 @@ |
| 1133 | 1127 | } |
| 1134 | 1128 | if( isset( $wgHtmlEntities[$name] ) ) { |
| 1135 | 1129 | return codepointToUtf8( $wgHtmlEntities[$name] ); |
| 1136 | | - } elseif( $name == 'apos' ) { |
| 1137 | | - return "'"; // "'" is not in $wgHtmlEntities, but it's still valid XHTML |
| 1138 | 1130 | } else { |
| 1139 | 1131 | return "&$name;"; |
| 1140 | 1132 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -470,8 +470,6 @@ |
| 471 | 471 | local URLs |
| 472 | 472 | * (bug 16376) Mention in deleteBatch.php and moveBatch.php maintenance scripts |
| 473 | 473 | that STDIN can be used for page list |
| 474 | | -* Sanitizer::decodeCharReferences() now decodes the XHTML "'" character |
| 475 | | - entity (loosely related to bug 14365) |
| 476 | 474 | * (bug 16560) Special:Random returns a page from ContentNamespaces, and no |
| 477 | 475 | longer from NS_MAIN |
| 478 | 476 | |