Update deprecated method calls

Remove some unused stuff

diff --git a/includes/Article.php b/includes/Article.php
index 71aae25..fe9efa3 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -2125,8 +2125,6 @@ class Article {
                                $userAbort = ignore_user_abort( true );
                        }
 
-                       $revisionId = 0;
-
                        $changed = ( strcmp( $text, $oldtext ) != 0 );
 
                        if ( $changed ) {

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 1091aaa..4d433d4 100644 (file)
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -169,7 +169,7 @@ class ChangeTags {
 
                $html = implode( ' ', $data );
                $html .= "\n" . Xml::element( 'input', array( 'type' => 'submit', 'value' => wfMsg( 'tag-filter-submit' ) ) );
-               $html .= "\n" . Xml::hidden( 'title', $wgTitle-> getPrefixedText() );
+               $html .= "\n" . Html::hidden( 'title', $wgTitle-> getPrefixedText() );
                $html = Xml::tags( 'form', array( 'action' => $wgTitle->getLocalURL(), 'method' => 'get' ), $html );
 
                return $html;

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 2dc8d0d..030330b 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -174,7 +174,7 @@ class FileDeleteForm {
                        'id' => 'mw-img-deleteconfirm' ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
-                       Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
+                       Html::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
                        $this->prepareMessage( 'filedelete-intro' ) .
                        Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
                        "<tr>

diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php
index 2902734..47084aa 100644 (file)
--- a/includes/FileRevertForm.php
+++ b/includes/FileRevertForm.php
@@ -92,7 +92,7 @@ class FileRevertForm {
                $timestamp = $this->getTimestamp();
 
                $form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) );
-               $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->archiveName ) );
+               $form .= Html::hidden( 'wpEditToken', $wgUser->editToken( $this->archiveName ) );
                $form .= '<fieldset><legend>' . wfMsgHtml( 'filerevert-legend' ) . '</legend>';
                $form .= wfMsgExt( 'filerevert-intro', 'parse', $this->title->getText(),
                        $wgLang->date( $timestamp, true ), $wgLang->time( $timestamp, true ),

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index 8039350..42730eb 100644 (file)
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -146,8 +146,8 @@ class HistoryPage {
                                false,
                                array( 'id' => 'mw-history-search' )
                        ) .
-                       Xml::hidden( 'title', $this->title->getPrefixedDBKey() ) . "\n" .
-                       Xml::hidden( 'action', 'history' ) . "\n" .
+                       Html::hidden( 'title', $this->title->getPrefixedDBKey() ) . "\n" .
+                       Html::hidden( 'action', 'history' ) . "\n" .
                        Xml::dateMenu( $year, $month ) . ' ' .
                        ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) .
                        $checkDeleted .

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 711dec2..c9b91f1 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -95,8 +95,7 @@ class LogEventsList {
 
                $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
 
-               $html = '';
-               $html .= Xml::hidden( 'title', $special );
+               $html = Html::hidden( 'title', $special );
 
                // Basic selectors
                $html .= $this->getTypeMenu( $types ) . "\n";
@@ -163,7 +162,7 @@ class LogEventsList {
                        );
 
                        $links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link );
-                       $hiddens .= Xml::hidden( "hide_{$type}_log", $val ) . "\n";
+                       $hiddens .= Html::hidden( "hide_{$type}_log", $val ) . "\n";
                }
                // Build links
                return '<small>'.$wgLang->pipeList( $links ) . '</small>' . $hiddens;

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index 94172e2..9c9bbd1 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -1181,7 +1181,6 @@ class MssqlResult {
   public function fieldtype( $nr ) {
        $i = 0;
        $intType = -1;
-       $strType = '';
        foreach ( $this->mFieldMeta as $meta ) {
                if ( $nr == $i ) {
                        $intType = $meta['Type'];

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 584fc6d..116db0b 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -55,7 +55,7 @@ abstract class WebInstallerPage {
                $id = $this->getId();
                
                if ( $id === false ) {
-                       $s .= Xml::hidden( 'lastPage', $this->parent->request->getVal( 'lastPage' ) );
+                       $s .= Html::hidden( 'lastPage', $this->parent->request->getVal( 'lastPage' ) );
                }
                
                if ( $continue ) {

diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php
index dc07241..f016ab9 100644 (file)
--- a/includes/specials/SpecialActiveusers.php
+++ b/includes/specials/SpecialActiveusers.php
@@ -136,11 +136,11 @@ class ActiveUsersPager extends UsersPager {
                global $wgScript;
 
                $self = $this->getTitle();
-               $limit = $this->mLimit ? Xml::hidden( 'limit', $this->mLimit ) : '';
+               $limit = $this->mLimit ? Html::hidden( 'limit', $this->mLimit ) : '';
 
-               $out  = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); # Form tag
+               $out = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); # Form tag
                $out .= Xml::fieldset( wfMsg( 'activeusers' ) ) . "\n";
-               $out .= Xml::hidden( 'title', $self->getPrefixedDBkey() ) . $limit . "\n";
+               $out .= Html::hidden( 'title', $self->getPrefixedDBkey() ) . $limit . "\n";
 
                $out .= Xml::inputLabel( wfMsg( 'activeusers-from' ), 'username', 'offset', 20, $this->requestedUser ) . '<br />';# Username field
 

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 01065a3..15db4b3 100644 (file)
--- a/includes/specials/SpecialAllmessages.php
+++ b/includes/specials/SpecialAllmessages.php
@@ -81,7 +81,7 @@ class SpecialAllmessages extends SpecialPage {
 
                $out  = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-allmessages-form' ) ) .
                        Xml::fieldset( wfMsg( 'allmessages-filter-legend' ) ) .
-                       Xml::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
+                       Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
                        Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" .
                        '<tr>
                                <td class="mw-label">' .

diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php
index 8f3fb12..e0fbe02 100644 (file)
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -98,7 +98,7 @@ class SpecialAllpages extends IncludableSpecialPage {
        
                $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
                $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-               $out .= Xml::hidden( 'title', $t->getPrefixedText() );
+               $out .= Html::hidden( 'title', $t->getPrefixedText() );
                $out .= Xml::openElement( 'fieldset' );
                $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
                $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );

diff --git a/includes/specials/SpecialBooksources.php b/includes/specials/SpecialBooksources.php
index 436186f..6205a51 100644 (file)
--- a/includes/specials/SpecialBooksources.php
+++ b/includes/specials/SpecialBooksources.php
@@ -119,7 +119,7 @@ class SpecialBookSources extends SpecialPage {
                $title = self::getTitleFor( 'Booksources' );
                $form  = '<fieldset><legend>' . wfMsgHtml( 'booksources-search-legend' ) . '</legend>';
                $form .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-               $form .= Xml::hidden( 'title', $title->getPrefixedText() );
+               $form .= Html::hidden( 'title', $title->getPrefixedText() );
                $form .= '<p>' . Xml::inputLabel( wfMsg( 'booksources-isbn' ), 'isbn', 'isbn', 20, $this->isbn );
                $form .= '&#160;' . Xml::submitButton( wfMsg( 'booksources-go' ) ) . '</p>';
                $form .= Xml::closeElement( 'form' );

diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index 5cf567b..c410474 100644 (file)
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -127,7 +127,7 @@ class CategoryPager extends AlphabeticPager {
        
                return
                        Xml::tags( 'form', array( 'method' => 'get', 'action' => $wgScript ),
-                               Xml::hidden( 'title', $t->getPrefixedText() ) .
+                               Html::hidden( 'title', $t->getPrefixedText() ) .
                                Xml::fieldset( wfMsg( 'categories' ),
                                        Xml::inputLabel( wfMsg( 'categoriesfrom' ),
                                                'from', 'from', 20, $from ) .

diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php
index 30d2de8..8f7d024 100644 (file)
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@ -120,7 +120,7 @@ class SpecialComparePages extends SpecialPage {
                // Store query values in hidden fields so that form submission doesn't lose them
                $hidden = array();
                foreach ( $this->opts->getUnconsumedValues() as $key => $value ) {
-                       $hidden[] = Xml::hidden( $key, $value );
+                       $hidden[] = Html::hidden( $key, $value );
                }
                $hidden = implode( "\n", $hidden );
 

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 570f8a5..d7da6b4 100644 (file)
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -102,7 +102,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
                        }
                        $wgOut->addWikiMsg( 'confirmemail_text' );
                        $form  = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl() ) );
-                       $form .= Xml::hidden( 'token', $wgUser->editToken() );
+                       $form .= Html::hidden( 'token', $wgUser->editToken() );
                        $form .= Xml::submitButton( wfMsg( 'confirmemail_send' ) );
                        $form .= Xml::closeElement( 'form' );
                        $wgOut->addHTML( $form );

diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index 06b096f..b0a6b39 100644 (file)
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -101,7 +101,7 @@ function wfSpecialFileDuplicateSearch( $par = null ) {
        # Create the input form
        $wgOut->addHTML(
                Xml::openElement( 'form', array( 'id' => 'fileduplicatesearch', 'method' => 'get', 'action' => $wgScript ) ) .
-               Xml::hidden( 'title', SpecialPage::getTitleFor( 'FileDuplicateSearch' )->getPrefixedDbKey() ) .
+               Html::hidden( 'title', SpecialPage::getTitleFor( 'FileDuplicateSearch' )->getPrefixedDbKey() ) .
                Xml::openElement( 'fieldset' ) .
                Xml::element( 'legend', null, wfMsg( 'fileduplicatesearch-legend' ) ) .
                Xml::inputLabel( wfMsg( 'fileduplicatesearch-filename' ), 'filename', 'filename', 50, $filename ) . ' ' .

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 375ddf1..77d45d2 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -150,8 +150,8 @@ class SpecialImport extends SpecialPage {
                                Xml::fieldset( wfMsg( 'import-upload' ) ).
                                Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post',
                                        'action' => $action, 'id' => 'mw-import-upload-form' ) ) .
-                               Xml::hidden( 'action', 'submit' ) .
-                               Xml::hidden( 'source', 'upload' ) .
+                               Html::hidden( 'action', 'submit' ) .
+                               Html::hidden( 'source', 'upload' ) .
                                Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
 
                                "<tr>
@@ -178,7 +178,7 @@ class SpecialImport extends SpecialPage {
                                        "</td>
                                </tr>" .
                                Xml::closeElement( 'table' ).
-                               Xml::hidden( 'editToken', $wgUser->editToken() ) .
+                               Html::hidden( 'editToken', $wgUser->editToken() ) .
                                Xml::closeElement( 'form' ) .
                                Xml::closeElement( 'fieldset' )
                        );

diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 9b9c605..ff76c70 100644 (file)
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -63,8 +63,8 @@ function wfSpecialLinkSearch( $par ) {
        $self = Title::makeTitle( NS_SPECIAL, 'Linksearch' );
 
        $wgOut->addWikiMsg( 'linksearch-text', '<nowiki>' . $wgLang->commaList( $wgUrlProtocols ) . '</nowiki>' );
-       $s =    Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) .
-               Xml::hidden( 'title', $self->getPrefixedDbKey() ) .
+       $s = Xml::openElement( 'form', array( 'id' => 'mw-linksearch-form', 'method' => 'get', 'action' => $GLOBALS['wgScript'] ) ) .
+               Html::hidden( 'title', $self->getPrefixedDbKey() ) .
                '<fieldset>' .
                Xml::element( 'legend', array(), wfMsg( 'linksearch' ) ) .
                Xml::inputLabel( wfMsg( 'linksearch-pat' ), 'target', 'target', 50, $target ) . ' ';

diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index d959f5f..007f058 100644 (file)
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -182,7 +182,7 @@ class UsersPager extends AlphabeticPager {
                # Form tag
                $out  = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-listusers-form' ) ) .
                        Xml::fieldset( wfMsg( 'listusers' ) ) .
-                       Xml::hidden( 'title', $self->getPrefixedDbKey() );
+                       Html::hidden( 'title', $self->getPrefixedDbKey() );
 
                # Username field
                $out .= Xml::label( wfMsg( 'listusersfrom' ), 'offset' ) . ' ' .
@@ -203,7 +203,7 @@ class UsersPager extends AlphabeticPager {
                wfRunHooks( 'SpecialListusersHeaderForm', array( $this, &$out ) );
 
                # Submit button and form bottom
-               $out .= Xml::hidden( 'limit', $this->mLimit );
+               $out .= Html::hidden( 'limit', $this->mLimit );
                $out .= Xml::submitButton( wfMsg( 'allpagessubmit' ) );
                wfRunHooks( 'SpecialListusersHeader', array( $this, &$out ) );
                $out .= Xml::closeElement( 'fieldset' ) .

diff --git a/includes/specials/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php
index 77ce2e8..79683a3 100644 (file)
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -107,7 +107,7 @@ function wfSpecialMIMEsearch( $par = null ) {
        $wgOut->addHTML(
                Xml::openElement( 'form', array( 'id' => 'specialmimesearch', 'method' => 'get', 'action' => SpecialPage::getTitleFor( 'MIMEsearch' )->getLocalUrl() ) ) .
                Xml::openElement( 'fieldset' ) .
-               Xml::hidden( 'title', SpecialPage::getTitleFor( 'MIMEsearch' )->getPrefixedText() ) .
+               Html::hidden( 'title', SpecialPage::getTitleFor( 'MIMEsearch' )->getPrefixedText() ) .
                Xml::element( 'legend', null, wfMsg( 'mimesearch' ) ) .
                Xml::inputLabel( wfMsg( 'mimetype' ), 'mime', 'mime', 20, $mime ) . ' ' .
                Xml::submitButton( wfMsg( 'ilsubmit' ) ) .

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index b59f80e..ad04413 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -142,9 +142,9 @@ class SpecialMergeHistory extends SpecialPage {
                        '<fieldset>' .
                        Xml::element( 'legend', array(),
                                wfMsg( 'mergehistory-box' ) ) .
-                       Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
-                       Xml::hidden( 'submitted', '1' ) .
-                       Xml::hidden( 'mergepoint', $this->mTimestamp ) .
+                       Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
+                       Html::hidden( 'submitted', '1' ) .
+                       Html::hidden( 'mergepoint', $this->mTimestamp ) .
                        Xml::openElement( 'table' ) .
                        "<tr>
                                <td>".Xml::label( wfMsg( 'mergehistory-from' ), 'target' )."</td>

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index f053fe3..8f5031f 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -196,7 +196,7 @@ class SpecialNewpages extends IncludableSpecialPage {
                // Store query values in hidden fields so that form submission doesn't lose them
                $hidden = array();
                foreach ( $this->opts->getUnconsumedValues() as $key => $value ) {
-                       $hidden[] = Xml::hidden( $key, $value );
+                       $hidden[] = Html::hidden( $key, $value );
                }
                $hidden = implode( "\n", $hidden );
 

diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 36ac08b..20e6796 100644 (file)
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -76,7 +76,7 @@ class SpecialPrefixindex extends SpecialAllpages {
 
                $out  = Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) );
                $out .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
-               $out .= Xml::hidden( 'title', $t->getPrefixedText() );
+               $out .= Html::hidden( 'title', $t->getPrefixedText() );
                $out .= Xml::openElement( 'fieldset' );
                $out .= Xml::element( 'legend', null, wfMsg( 'allpages' ) );
                $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) );

diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index c467ae0..e664c20 100644 (file)
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -158,7 +158,7 @@ class SpecialProtectedpages extends SpecialPage {
                return Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', array(), wfMsg( 'protectedpages' ) ) .
-                       Xml::hidden( 'title', $title->getPrefixedDBkey() ) . "\n" .
+                       Html::hidden( 'title', $title->getPrefixedDBkey() ) . "\n" .
                        $this->getNamespaceMenu( $namespace ) . " \n" .
                        $this->getTypeMenu( $type ) . " \n" .
                        $this->getLevelMenu( $level ) . " \n" .

diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index 1a54ad2..5b18d87 100644 (file)
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -119,7 +119,7 @@ class SpecialProtectedtitles extends SpecialPage {
                return "<form action=\"$action\" method=\"get\">\n" .
                        '<fieldset>' .
                        Xml::element( 'legend', array(), wfMsg( 'protectedtitles' ) ) .
-                       Xml::hidden( 'title', $special ) . "&#160;\n" .
+                       Html::hidden( 'title', $special ) . "&#160;\n" .
                        $this->getNamespaceMenu( $namespace ) . "&#160;\n" .
                        $this->getLevelMenu( $level ) . "&#160;\n" .
                        "&#160;" . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index f4893ba..3d2bf4b 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -140,9 +140,9 @@ class SpecialResetpass extends SpecialPage {
                                        'method' => 'post',
                                        'action' => $self->getLocalUrl(),
                                        'id' => 'mw-resetpass-form' ) ) . "\n" .
-                       Xml::hidden( 'token', $wgUser->editToken() ) . "\n" .
-                       Xml::hidden( 'wpName', $this->mUserName ) . "\n" .
-                       Xml::hidden( 'returnto', $wgRequest->getVal( 'returnto' ) ) . "\n" .
+                       Html::hidden( 'token', $wgUser->editToken() ) . "\n" .
+                       Html::hidden( 'wpName', $this->mUserName ) . "\n" .
+                       Html::hidden( 'returnto', $wgRequest->getVal( 'returnto' ) ) . "\n" .
                        wfMsgExt( 'resetpass_text', array( 'parse' ) ) . "\n" .
                        Xml::openElement( 'table', array( 'id' => 'mw-resetpass-table' ) ) . "\n" .
                        $this->pretty( array(

diff --git a/includes/specials/SpecialRevisionMove.php b/includes/specials/SpecialRevisionMove.php
index eda52a1..813e273 100644 (file)
--- a/includes/specials/SpecialRevisionMove.php
+++ b/includes/specials/SpecialRevisionMove.php
@@ -149,11 +149,11 @@ class SpecialRevisionMove extends UnlistedSpecialPage {
                                'action' => $this->getTitle()->getLocalUrl( array( 'action' => 'submit' ) ),
                                'id' => 'mw-revmove-form' ) ) .
                        Xml::fieldset( wfMsg( 'revmove-legend' ) ) .
-                       Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
-                       Xml::hidden( 'oldTitle', $this->mOldTitle->getPrefixedText() ) .
+                       Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
+                       Html::hidden( 'oldTitle', $this->mOldTitle->getPrefixedText() ) .
                        '<div>' . Xml::inputLabel( wfMsg( 'revmove-reasonfield' ), 'wpReason', 'revmove-reasonfield', 60 ) . '</div>' .
                        Xml::inputLabel( wfMsg( 'revmove-titlefield' ), 'newTitle', 'revmove-titlefield', 20, $this->mOldTitle->getPrefixedText() ) .
-                       Xml::hidden( 'ids', implode( ',', $this->mIds ) ) .
+                       Html::hidden( 'ids', implode( ',', $this->mIds ) ) .
                        Xml::submitButton( wfMsg( 'revmove-submit' ),
                                                        array( 'name' => 'wpSubmit' ) ) .
                        Xml::closeElement( 'fieldset' ) . "\n" .

diff --git a/includes/specials/SpecialWithoutinterwiki.php b/includes/specials/SpecialWithoutinterwiki.php
index 6e163f2..90c1f44 100644 (file)
--- a/includes/specials/SpecialWithoutinterwiki.php
+++ b/includes/specials/SpecialWithoutinterwiki.php
@@ -48,7 +48,7 @@ class WithoutInterwikiPage extends PageQueryPage {
                return  Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'withoutinterwiki-legend' ) ) .
-                       Xml::hidden( 'title', $t->getPrefixedText() ) .
+                       Html::hidden( 'title', $t->getPrefixedText() ) .
                        Xml::inputLabel( wfMsg( 'allpagesprefix' ), 'prefix', 'wiprefix', 20, $prefix ) . ' ' .
                        Xml::submitButton( wfMsg( 'withoutinterwiki-submit' ) ) .
                        Xml::closeElement( 'fieldset' ) .

diff --git a/languages/Language.php b/languages/Language.php
index 0a8bb1e..9a1a302 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -977,7 +977,6 @@ class Language {
                                } else {
                                        $s .= $this->formatNum( $num, true );
                                }
-                               $num = false;
                        }
                }
                return $s;