summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
77b2dc7)
We should never be outputting named entities other than the ones in XML,
< > & ", because that will break well-formedness unless
we have a DTD in the doctype, which we don't in HTML5 mode.
I stuck with outputting numeric entities here instead of UTF-8 because
some characters are hard to read in UTF-8 (e.g., ). Maybe it
would be nicer if we decoded to UTF-8 except for whitespace and control
characters, or something like that, but it's a detail.
I'll backport to 1.17 and add RELEASE-NOTES there, which is why I added
the line to HISTORY instead of RELEASE-NOTES.
* (bug 20244) Installer does not validate SQLite database directory for stable path
* (bug 1379) Installer directory conflicts with some hosts' configuration panel.
* (bug 12070) After Installation MySQL was blocked
* (bug 20244) Installer does not validate SQLite database directory for stable path
* (bug 1379) Installer directory conflicts with some hosts' configuration panel.
* (bug 12070) After Installation MySQL was blocked
+* Fix XML well-formedness on a few pages when $wgHtml5 is true (the default)
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.
=== API changes in 1.17 ===
* (bug 22738) Allow filtering by action type on query=logevent.
* for XML and XHTML specifically. Any stray bits will be
* &-escaped to result in a valid text fragment.
*
* for XML and XHTML specifically. Any stray bits will be
* &-escaped to result in a valid text fragment.
*
- * a. any named char refs must be known in XHTML
+ * a. named char refs can only be < > & ", others are
+ * numericized (this way we're well-formed even without a DTD)
* b. any numeric char refs must be legal chars, not invalid or forbidden
* c. use &#x, not &#X
* d. fix or reject non-valid attributes
* b. any numeric char refs must be legal chars, not invalid or forbidden
* c. use &#x, not &#X
* d. fix or reject non-valid attributes
/**
* If the named entity is defined in the HTML 4.0/XHTML 1.0 DTD,
/**
* If the named entity is defined in the HTML 4.0/XHTML 1.0 DTD,
- * return the named entity reference as is. If the entity is a
- * MediaWiki-specific alias, returns the HTML equivalent. Otherwise,
- * returns HTML-escaped text of pseudo-entity source (eg &foo;)
+ * return the equivalent numeric entity reference (except for the core <
+ * > & "). If the entity is a MediaWiki-specific alias, returns
+ * the HTML equivalent. Otherwise, returns HTML-escaped text of
+ * pseudo-entity source (eg &foo;)
*
* @param $name String
* @return String
*
* @param $name String
* @return String
global $wgHtmlEntities, $wgHtmlEntityAliases;
if ( isset( $wgHtmlEntityAliases[$name] ) ) {
return "&{$wgHtmlEntityAliases[$name]};";
global $wgHtmlEntities, $wgHtmlEntityAliases;
if ( isset( $wgHtmlEntityAliases[$name] ) ) {
return "&{$wgHtmlEntityAliases[$name]};";
- } elseif( isset( $wgHtmlEntities[$name] ) ) {
+ } elseif ( in_array( $name,
+ array( 'lt', 'gt', 'amp', 'quot' ) ) ) {
+ } elseif ( isset( $wgHtmlEntities[$name] ) ) {
+ return "&#{$wgHtmlEntities[$name]};";
} else {
return "&$name;";
}
} else {
return "&$name;";
}
<caption>Multiplication table
</caption>
<tr>
<caption>Multiplication table
</caption>
<tr>
<th> 1 </th>
<th> 2 </th>
<th> 3
<th> 1 </th>
<th> 2 </th>
<th> 3
!! result
<table border="1">
<tr>
!! result
<table border="1">
<tr>
</td>
<td>
<table bgcolor="#ABCDEF" border="2">
</td>
<td>
<table bgcolor="#ABCDEF" border="2">
!! input
[[ Main Page ]]
!! result
!! input
[[ Main Page ]]
!! result
-<p><a href="/wiki/Main_Page" title="Main Page"> Main Page </a>
+<p><a href="/wiki/Main_Page" title="Main Page">  Main   Page  </a>