*Remove double-escaping and inconsistent capitalization

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 5f47fa1..d21b6d2 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -240,7 +240,7 @@ class IPBlockForm {
                <tr>
                        <td style='padding-top: 1em'>&nbsp;</td>
                        <td style='padding-top: 1em' align=\"left\">
-                               " . Xml::submitButton( wfMsgHtml( 'ipbsubmit' ),
+                               " . Xml::submitButton( wfMsg( 'ipbsubmit' ),
                                                        array( 'name' => 'wpBlock', 'tabindex' => '10' ) ) . "
                        </td>
                </tr>

diff --git a/includes/SpecialProtectedpages.php b/includes/SpecialProtectedpages.php
index 483c135..d66fe4e 100644 (file)
--- a/includes/SpecialProtectedpages.php
+++ b/includes/SpecialProtectedpages.php
@@ -39,7 +39,7 @@ class ProtectedPagesForm {
                                "</ul>";
                        $s .= $pager->getNavigationBar();
                } else {
-                       $s = '<p>' . wfMsgHTML( 'protectedpagesempty' ) . '</p>';
+                       $s = '<p>' . wfMsgHtml( 'protectedpagesempty' ) . '</p>';
                }
                $wgOut->addHTML( $s );
        }
@@ -121,9 +121,9 @@ class ProtectedPagesForm {
         */
        function getSizeLimit( $sizetype, $size ) {     
                $out = Xml::radio( 'sizetype', 'min', ($sizetype=='min'), array('id' => 'wpmin') );
-               $out .= Xml::label( wfMsgHtml("minimum-size"), 'wpmin' );
+               $out .= Xml::label( wfMsg("minimum-size"), 'wpmin' );
                $out .= "&nbsp".Xml::radio( 'sizetype', 'max', ($sizetype=='max'), array('id' => 'wpmax') );
-               $out .= Xml::label( wfMsgHtml("maximum-size"), 'wpmax' );
+               $out .= Xml::label( wfMsg("maximum-size"), 'wpmax' );
                $out .= "&nbsp".Xml::input('size', 9, $size, array( 'id' => 'wpsize' ) );
                $out .= ' '.wfMsg('pagesize');
                return $out;