Cleanup -- fix broken XHTML in deletion forms

diff --git a/includes/Article.php b/includes/Article.php
index 626d59c..7bf0533 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2096,7 +2096,7 @@ class Article {
                        Xml::element( 'legend', array(), wfMsg( 'delete-legend' ) ) .
                        Xml::openElement( 'table' ) .
                        "<tr id=\"wpDeleteReasonListRow\" name=\"wpDeleteReasonListRow\">
-                               <td align=$align>" .
+                               <td align='$align'>" .
                                        Xml::label( wfMsg( 'deletecomment' ), 'wpDeleteReasonList' ) .
                                "</td>
                                <td>" .
@@ -2106,7 +2106,7 @@ class Article {
                                "</td>
                        </tr>
                        <tr id=\"wpDeleteReasonRow\" name=\"wpDeleteReasonRow\">
-                               <td align=$align>" .
+                               <td align='$align'>" .
                                        Xml::label( wfMsg( 'deleteotherreason' ), 'wpReason' ) .
                                "</td>
                                <td>" .
@@ -2128,7 +2128,6 @@ class Article {
                        Xml::closeElement( 'table' ) .
                        Xml::closeElement( 'fieldset' ) .
                        Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
-                       Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' );
 
                $wgOut->addHTML( $form );

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index d5c98cc..48e1a0e 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -120,7 +120,7 @@ class FileDeleteForm {
                        $this->prepareMessage( 'filedelete-intro' ) .
                        Xml::openElement( 'table' ) .
                        "<tr>
-                               <td align=$align>" .
+                               <td align='$align'>" .
                                        Xml::label( wfMsg( 'filedelete-comment' ), 'wpDeleteReasonList' ) .
                                "</td>
                                <td>" .
@@ -130,7 +130,7 @@ class FileDeleteForm {
                                "</td>
                        </tr>
                        <tr>
-                               <td align=$align>" .
+                               <td align='$align'>" .
                                        Xml::label( wfMsg( 'filedelete-otherreason' ), 'wpReason' ) .
                                "</td>
                                <td>" .