Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update deprecated method calls

Browse source 
Remove some unused stuff
This commit is contained in:
Sam Reed 2010-10-31 16:20:48 +00:00
parent eda718909c
commit 604ae0ca1c
29 changed files with 40 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Article.php
View file

@ -2125,8 +2125,6 @@ class Article {
$userAbort = ignore_user_abort( true );
}
$revisionId = 0;
$changed = ( strcmp( $text, $oldtext ) != 0 );
if ( $changed ) {

2
includes/ChangeTags.php
View file

@ -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;

2
includes/FileDeleteForm.php
View file

@ -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>

2
includes/FileRevertForm.php
View file

@ -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 ),

4
includes/HistoryPage.php
View file

@ -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 ) . '&#160;' .
( $tagSelector ? ( implode( '&#160;', $tagSelector ) . '&#160;' ) : '' ) .
$checkDeleted .

5
includes/LogEventsList.php
View file

@ -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;

1
includes/db/DatabaseMssql.php
View file

@ -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'];

2
includes/installer/WebInstallerPage.php
View file

@ -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 ) {

6
includes/specials/SpecialActiveusers.php
View file

@ -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

2
includes/specials/SpecialAllmessages.php
View file

@ -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">' .

2
includes/specials/SpecialAllpages.php
View file

@ -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' ) );

2
includes/specials/SpecialBooksources.php
View file

@ -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' );

2
includes/specials/SpecialCategories.php
View file

@ -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 ) .

2
includes/specials/SpecialComparePages.php
View file

@ -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 );

2
includes/specials/SpecialConfirmemail.php
View file

@ -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 );

2
includes/specials/SpecialFileDuplicateSearch.php
View file

@ -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 ) . ' ' .

6
includes/specials/SpecialImport.php
View file

@ -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' )
);

4
includes/specials/SpecialLinkSearch.php
View file

@ -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 ) . ' ';

4
includes/specials/SpecialListusers.php
View file

@ -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' ) .

2
includes/specials/SpecialMIMEsearch.php
View file

@ -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' ) ) .

6
includes/specials/SpecialMergeHistory.php
View file

@ -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>

2
includes/specials/SpecialNewpages.php
View file

@ -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 );

2
includes/specials/SpecialPrefixindex.php
View file

@ -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' ) );

2
includes/specials/SpecialProtectedpages.php
View file

@ -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 ) . "&#160;\n" .
$this->getTypeMenu( $type ) . "&#160;\n" .
$this->getLevelMenu( $level ) . "&#160;\n" .

2
includes/specials/SpecialProtectedtitles.php
View file

@ -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" .

6
includes/specials/SpecialResetpass.php
View file

@ -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(

6
includes/specials/SpecialRevisionMove.php
View file

@ -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" .

2
includes/specials/SpecialWithoutinterwiki.php
View file

@ -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' ) .

1
languages/Language.php
View file

@ -977,7 +977,6 @@ class Language {
} else {
$s .= $this->formatNum( $num, true );
}
$num = false;
}
}
return $s;