From: Sam Reed Date: Sun, 31 Oct 2010 16:20:48 +0000 (+0000) Subject: Update deprecated method calls X-Git-Tag: 1.31.0-rc.0~34189 X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=604ae0ca1c0f5d04bbed89bf161dd466cf7069a4;p=lhc%2Fweb%2Fwiklou.git Update deprecated method calls Remove some unused stuff --- diff --git a/includes/Article.php b/includes/Article.php index 71aae25702..fe9efa3c1a 100644 --- 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 1091aaa1db..4d433d4e65 100644 --- 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 2dc8d0d00b..030330bbeb 100644 --- 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' ) ) . " diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php index 29027345f5..47084aad4f 100644 --- 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 .= '
' . wfMsgHtml( 'filerevert-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 803935064b..42730ebfc7 100644 --- 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 711dec24bd..c9b91f1488 100644 --- 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 ''.$wgLang->pipeList( $links ) . '' . $hiddens; diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 94172e2fda..9c9bbd1784 100644 --- 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 584fc6d712..116db0bb16 100644 --- 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 dc07241e38..f016ab9292 100644 --- 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 ) . '
';# Username field diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index 01065a3388..15db4b321c 100644 --- 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" . ' ' . diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php index 8f3fb12b37..e0fbe024cc 100644 --- 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 436186f6a3..6205a51a3f 100644 --- a/includes/specials/SpecialBooksources.php +++ b/includes/specials/SpecialBooksources.php @@ -119,7 +119,7 @@ class SpecialBookSources extends SpecialPage { $title = self::getTitleFor( 'Booksources' ); $form = '
' . wfMsgHtml( 'booksources-search-legend' ) . ''; $form .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); - $form .= Xml::hidden( 'title', $title->getPrefixedText() ); + $form .= Html::hidden( 'title', $title->getPrefixedText() ); $form .= '

' . Xml::inputLabel( wfMsg( 'booksources-isbn' ), 'isbn', 'isbn', 20, $this->isbn ); $form .= ' ' . Xml::submitButton( wfMsg( 'booksources-go' ) ) . '

'; $form .= Xml::closeElement( 'form' ); diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php index 5cf567b882..c4104745d8 100644 --- 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 30d2de8ba2..8f7d024307 100644 --- 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 570f8a58cd..d7da6b4ef5 100644 --- 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 06b096f4b6..b0a6b39f15 100644 --- 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 375ddf1abb..77d45d23ae 100644 --- 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' ) ) . " @@ -178,7 +178,7 @@ class SpecialImport extends SpecialPage { " " . 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 9b9c6052bb..ff76c70042 100644 --- 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', '' . $wgLang->commaList( $wgUrlProtocols ) . '' ); - $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() ) . '
' . 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 d959f5f534..007f058c64 100644 --- 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 77ce2e823e..79683a35d8 100644 --- 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 b59f80eb85..ad044137b8 100644 --- a/includes/specials/SpecialMergeHistory.php +++ b/includes/specials/SpecialMergeHistory.php @@ -142,9 +142,9 @@ class SpecialMergeHistory extends SpecialPage { '
' . 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' ) . " ".Xml::label( wfMsg( 'mergehistory-from' ), 'target' )." diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index f053fe3a9c..8f5031f953 100644 --- 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 36ac08b943..20e67969ac 100644 --- 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 c467ae019e..e664c20d48 100644 --- 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 1a54ad2ae5..5b18d87f3b 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -119,7 +119,7 @@ class SpecialProtectedtitles extends SpecialPage { return "
\n" . '
' . Xml::element( 'legend', array(), wfMsg( 'protectedtitles' ) ) . - Xml::hidden( 'title', $special ) . " \n" . + Html::hidden( 'title', $special ) . " \n" . $this->getNamespaceMenu( $namespace ) . " \n" . $this->getLevelMenu( $level ) . " \n" . " " . Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php index f4893badc3..3d2bf4bcb6 100644 --- 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 eda52a1743..813e273f7c 100644 --- 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() ) . '
' . Xml::inputLabel( wfMsg( 'revmove-reasonfield' ), 'wpReason', 'revmove-reasonfield', 60 ) . '
' . 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 6e163f2594..90c1f441e5 100644 --- 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 0a8bb1e2f1..9a1a302a8a 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -977,7 +977,6 @@ class Language { } else { $s .= $this->formatNum( $num, true ); } - $num = false; } } return $s;