http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75646
Revision: 75646
Author: reedy
Date: 2010-10-29 15:32:44 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
More deprecated method call removals and updates
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.class.php
trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
trunk/extensions/AntiSpoof/AntiSpoof.php
trunk/extensions/AntiSpoof/AntiSpoof_body.php
trunk/extensions/CategoryTree/CategoryTreePage.php
trunk/extensions/CentralAuth/CentralAuth.php
trunk/extensions/CentralAuth/CentralAuthHooks.php
trunk/extensions/CentralAuth/SpecialCentralAuth.php
trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
trunk/extensions/CentralAuth/SpecialMergeAccount.php
trunk/extensions/CentralAuth/SpecialWikiSets.php
trunk/extensions/CentralNotice/SpecialCentralNotice.php
trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
trunk/extensions/CentralNotice/TemplatePager.php
trunk/extensions/CheckUser/CheckUser.php
trunk/extensions/Cite/Cite_body.php
trunk/extensions/Collection/Collection.body.php
trunk/extensions/Collection/Collection.hooks.php
trunk/extensions/Collection/Collection.php
trunk/extensions/ContactPage/SpecialContact.php
trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php
trunk/extensions/Gadgets/Gadgets.php
trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php
trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php
trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
trunk/extensions/InputBox/InputBox.classes.php
trunk/extensions/NewUserMessage/NewUserMessage.class.php
trunk/extensions/OggHandler/OggHandler_body.php
trunk/extensions/Oversight/HideRevision_body.php
trunk/extensions/ParserFunctions/ParserFunctions_body.php
trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php
trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
trunk/extensions/Renameuser/Renameuser_body.php
trunk/extensions/SecurePoll/includes/pages/VotePage.php
trunk/extensions/SiteMatrix/SiteMatrix_body.php
trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
trunk/extensions/TorBlock/TorBlock.class.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.class.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.class.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/AbuseFilter/AbuseFilter.class.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -197,8 +197,6 @@
}
public static function ajaxCheckSyntax( $filter ) {
- wfLoadExtensionMessages( 'AbuseFilter' );
-
global $wgUser;
if ( !$wgUser->isAllowed( 'abusefilter-modify' ) ) {
return false;
@@ -323,7 +321,6 @@
}
public static function evaluateExpression( $expr, $vars = array() ) {
- wfLoadExtensionMessages( 'AbuseFilter' );
global $wgAbuseFilterParserClass;
if ( self::checkSyntax( $expr ) !== true ) {
@@ -339,7 +336,6 @@
public static function ajaxReAutoconfirm( $username ) {
global $wgUser;
- wfLoadExtensionMessages( 'AbuseFilter' );
if ( !$wgUser->isAllowed( 'abusefilter-modify' ) ) {
// Don't allow it.
@@ -631,8 +627,6 @@
$actionsByFilter = self::getConsequencesForFilters( $filters );
$actionsTaken = array_fill_keys( $filters, array() );
- wfLoadExtensionMessages( 'AbuseFilter' );
-
$messages = array();
foreach ( $actionsByFilter as $filter => $actions ) {
Modified: trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.hooks.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/AbuseFilter/AbuseFilter.hooks.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -100,7 +100,6 @@
}
public static function onAbortNewAccount( $user, &$message ) {
- wfLoadExtensionMessages( 'AbuseFilter' );
if ( $user->getName() == wfMsgForContent( 'abusefilter-blocker'
) ) {
$message = wfMsg( 'abusefilter-accountreserved' );
return false;
@@ -221,7 +220,6 @@
public static function onContributionsToolLinks( $id, $nt, &$tools ) {
global $wgUser;
- wfLoadExtensionMessages( 'AbuseFilter' );
if ( $wgUser->isAllowed( 'abusefilter-log' ) ) {
$sk = $wgUser->getSkin();
$tools[] = $sk->link(
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -435,7 +435,7 @@
if ( $this->canEdit() ) {
$form .= Xml::submitButton( wfMsg(
'abusefilter-edit-save' ), array( 'accesskey' => 's' ) );
- $form .= Xml::hidden(
+ $form .= Html::hidden(
'wpEditToken',
$wgUser->editToken( array( 'abusefilter',
$filter ) )
);
Modified: trunk/extensions/AntiSpoof/AntiSpoof.php
===================================================================
--- trunk/extensions/AntiSpoof/AntiSpoof.php 2010-10-29 15:30:54 UTC (rev
75645)
+++ trunk/extensions/AntiSpoof/AntiSpoof.php 2010-10-29 15:32:44 UTC (rev
75646)
@@ -113,7 +113,6 @@
function asUserCreateFormHook( &$template ) {
global $wgRequest, $wgAntiSpoofAccounts, $wgUser;
- wfLoadExtensionMessages( 'AntiSpoof' );
if ( $wgAntiSpoofAccounts && $wgUser->isAllowed( 'override-antispoof' )
)
$template->addInputItem( 'wpIgnoreAntiSpoof',
Modified: trunk/extensions/AntiSpoof/AntiSpoof_body.php
===================================================================
--- trunk/extensions/AntiSpoof/AntiSpoof_body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/AntiSpoof/AntiSpoof_body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -262,7 +262,6 @@
# TODO: does too much in one routine, refactor...
public static function checkUnicodeString( $testName ) {
- wfLoadExtensionMessages( 'AntiSpoof' );
# Start with some sanity checking
if ( !is_string( $testName ) ) {
return array( "ERROR", wfMsg( 'antispoof-badtype' ) );
Modified: trunk/extensions/CategoryTree/CategoryTreePage.php
===================================================================
--- trunk/extensions/CategoryTree/CategoryTreePage.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CategoryTree/CategoryTreePage.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -109,7 +109,7 @@
$wgOut->addHTML( Xml::openElement( 'form', array( 'name' =>
'categorytree', 'method' => 'get', 'action' => $wgScript, 'id' =>
'mw-categorytree-form' ) ) );
$wgOut->addHTML( Xml::openElement( 'fieldset' ) );
$wgOut->addHTML( Xml::element( 'legend', null, wfMsgNoTrans(
'categorytree-legend' ) ) );
- $wgOut->addHTML( Xml::hidden( 'title',
$thisTitle->getPrefixedDbKey() ) );
+ $wgOut->addHTML( Xml::Html( 'title',
$thisTitle->getPrefixedDbKey() ) );
$wgOut->addHTML( Xml::inputLabel( wfMsgNoTrans(
'categorytree-category' ), 'target', 'target', 20, $this->target ) . ' ' );
$wgOut->addHTML( Xml::openElement( 'select', array( 'name' =>
'mode' ) ) );
$wgOut->addHTML( Xml::option( wfMsgNoTrans(
'categorytree-mode-categories' ), 'categories', $mode == CT_MODE_CATEGORIES ?
true : false ) );
Modified: trunk/extensions/CentralAuth/CentralAuth.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuth.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CentralAuth/CentralAuth.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -247,7 +247,6 @@
$wgLogActionsHandlers["gblrights/{$type}"] = 'efHandleWikiSetLogEntry';
function efHandleWikiSetLogEntry( $type, $action, $title, $skin, $params,
$filterWikilinks = false ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$link = $skin ? $skin->makeLinkObj( $title, $params[0] ) : $params[0];
if ( $action == 'newset' ) {
$args = array( WikiSet::formatType( $params[1] ), $params[2] );
Modified: trunk/extensions/CentralAuth/CentralAuthHooks.php
===================================================================
--- trunk/extensions/CentralAuth/CentralAuthHooks.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CentralAuth/CentralAuthHooks.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -92,7 +92,6 @@
static function onAbortNewAccount( $user, &$abortError ) {
$centralUser = CentralAuthUser::getInstance( $user );
if ( $centralUser->exists() ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$abortError = wfMsg( 'centralauth-account-exists' );
return false;
}
@@ -115,7 +114,6 @@
// On other domains
global $wgCentralAuthAutoLoginWikis;
if ( !$wgCentralAuthAutoLoginWikis ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$inject_html .= wfMsgExt(
'centralauth-login-no-others', 'parsemag' );
return true;
}
@@ -125,7 +123,6 @@
return true;
}
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$inject_html .= '<div class="centralauth-login-box"><p>' .
wfMsgExt( 'centralauth-login-progress', array(
'parsemag' ), $user->getName() ) . "</p>\n<p>";
foreach ( $wgCentralAuthAutoLoginWikis as $alt => $wiki ) {
@@ -266,7 +263,6 @@
// Nothing to do.
return true;
} elseif ( !$wgCentralAuthAutoLoginWikis ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$inject_html .= wfMsgExt(
'centralauth-logout-no-others', 'parse' );
return true;
}
@@ -276,13 +272,11 @@
if ( !$centralUser->exists() || !$centralUser->isAttached() ) {
return true;
} elseif ( !$wgCentralAuthAutoLoginWikis ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$inject_html .= wfMsgExt(
'centralauth-logout-no-others', 'parse' );
return true;
}
// Generate the images
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$inject_html .= '<div class="centralauth-logout-box"><p>' .
wfMsg( 'centralauth-logout-progress' ) . "</p>\n<p>";
$centralUser = new CentralAuthUser( $userName );
@@ -342,12 +336,10 @@
static function onRenameUserWarning( $oldName, $newName, &$warnings ) {
$oldCentral = new CentralAuthUser( $oldName );
if ( $oldCentral->exists() && $oldCentral->isAttached() ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$warnings[] = array( 'centralauth-renameuser-merged',
$oldName, $newName );
}
$newCentral = new CentralAuthUser( $newName );
if ( $newCentral->exists() && !$newCentral->isAttached() ) {
- wfLoadExtensionMessages( 'SpecialCentralAuth' );
$warnings[] = array( 'centralauth-renameuser-reserved',
$oldName, $newName );
}
return true;
Modified: trunk/extensions/CentralAuth/SpecialCentralAuth.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialCentralAuth.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CentralAuth/SpecialCentralAuth.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -230,7 +230,7 @@
'action' => $wgScript ) ) .
'<fieldset>' .
Xml::element( 'legend', array(), wfMsg(
'centralauth-admin-manage' ) ) .
- Xml::hidden( 'title',
$this->getTitle()->getPrefixedText() ) .
+ Html::hidden( 'title',
$this->getTitle()->getPrefixedText() ) .
'<p>' .
Xml::inputLabel( wfMsg( 'centralauth-admin-username' ),
'target', 'target', 25, $this->mUserName ) .
@@ -314,8 +314,8 @@
'action' =>
$this->getTitle(
$this->mUserName )->getLocalUrl( 'action=submit' ),
'id' => 'mw-centralauth-merged' ) ) .
- Xml::hidden( 'wpMethod', 'unmerge' ) .
- Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+ Html::hidden( 'wpMethod', 'unmerge' ) .
+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
Xml::openElement( 'table', array( 'class' => 'wikitable
sortable mw-centralauth-wikislist' ) ) . "\n" .
'<thead><tr>' .
( $this->mCanUnmerge ? '<th></th>' : '' ) .
@@ -487,8 +487,8 @@
'method' => 'POST',
'action' => $this->getTitle()->getFullUrl(
'target=' . urlencode( $this->mUserName ) ),
'id' => "mw-centralauth-$action" ) ) .
- Xml::hidden( 'wpMethod', $action ) .
- Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
+ Html::hidden( 'wpMethod', $action ) .
+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
wfMsgExt( "centralauth-admin-{$action}-description",
'parse' ) .
Xml::buildForm(
array( 'centralauth-admin-reason' =>
Xml::input( 'reason',
@@ -503,8 +503,8 @@
global $wgUser, $wgOut;
$form = '';
$form .= Xml::fieldset( wfMsg( 'centralauth-admin-status' ) );
- $form .= Xml::hidden( 'wpMethod', 'set-status' );
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $form .= Html::hidden( 'wpMethod', 'set-status' );
+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
$form .= wfMsgExt( 'centralauth-admin-status-intro', 'parse' );
// Radio buttons
Modified: trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -96,7 +96,7 @@
$html = Xml::fieldset( wfMsg(
'centralauth-newgroup-legend' ) );
$html .= wfMsgExt( 'centralauth-newgroup-intro', array(
'parse' ) );
$html .= Xml::openElement( 'form', array( 'method' =>
'post', 'action' => $wgScript, 'name' => 'centralauth-globalgroups-newgroup' )
);
- $html .= Xml::hidden( 'title',
SpecialPage::getTitleFor( 'GlobalGroupPermissions' )->getPrefixedText() );
+ $html .= Html::hidden( 'title',
SpecialPage::getTitleFor( 'GlobalGroupPermissions' )->getPrefixedText() );
$fields = array(
'centralauth-globalgroupperms-newgroupname' => Xml::input( 'wpGroup' ) );
@@ -119,8 +119,8 @@
if ( $editable ) {
$html .= Xml::openElement( 'form', array( 'method' =>
'post', 'action' => SpecialPage::getTitleFor( 'GlobalGroupPermissions', $group
)->getLocalUrl(), 'name' => 'centralauth-globalgroups-newgroup' ) );
- $html .= Xml::hidden( 'wpGroup', $group );
- $html .= Xml::hidden( 'wpEditToken',
$wgUser->editToken() );
+ $html .= Html::hidden( 'wpGroup', $group );
+ $html .= Html::hidden( 'wpEditToken',
$wgUser->editToken() );
}
$fields = array();
Modified: trunk/extensions/CentralAuth/SpecialMergeAccount.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialMergeAccount.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/CentralAuth/SpecialMergeAccount.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -426,10 +426,10 @@
'method' => 'post',
'action' =>
$this->getTitle()->getLocalUrl( 'action=submit' ) ) ) .
Xml::element( 'h2', array(), $title ) .
- Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
- Xml::hidden( 'wpMergeAction', $action ) .
- Xml::hidden( 'wpMergeSessionToken',
$this->mSessionToken ) .
- Xml::hidden( 'wpMergeSessionKey', bin2hex(
$this->mSessionKey ) ) .
+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
+ Html::hidden( 'wpMergeAction', $action ) .
+ Html::hidden( 'wpMergeSessionToken',
$this->mSessionToken ) .
+ Html::hidden( 'wpMergeSessionKey', bin2hex(
$this->mSessionKey ) ) .
$text .
Modified: trunk/extensions/CentralAuth/SpecialWikiSets.php
===================================================================
--- trunk/extensions/CentralAuth/SpecialWikiSets.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CentralAuth/SpecialWikiSets.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -141,7 +141,7 @@
$wgOut->addHTML( Xml::buildForm( $form,
'centralauth-editset-submit' ) );
- $edittoken = Xml::hidden( 'wpEditToken',
$wgUser->editToken() );
+ $edittoken = Html::hidden( 'wpEditToken',
$wgUser->editToken() );
$wgOut->addHTML(
"<p>{$edittoken}</p></form></fieldset>" );
} else {
$form = array();
@@ -185,7 +185,7 @@
$legend = wfMsgHtml( 'centralauth-editset-legend-delete',
$set->getName() );
$form = array( 'centralauth-editset-reason' => Xml::input(
'wpReason' ) );
$url = htmlspecialchars( SpecialPage::getTitleFor( 'WikiSets',
"delete/{$subpage}" )->getLocalUrl() );
- $edittoken = Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $edittoken = Html::hidden( 'wpEditToken', $wgUser->editToken()
);
$wgOut->addHTML( "<fieldset><legend>{$legend}</legend><form
action='{$url}' method='post'>" );
$wgOut->addHTML( Xml::buildForm( $form,
'centralauth-editset-submit-delete' ) );
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -474,8 +474,8 @@
// Form for adding a campaign
$htmlOut .= Xml::openElement( 'form', array( 'method'
=> 'post' ) );
$htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-add-notice' ) );
- $htmlOut .= Xml::hidden( 'title',
$this->getTitle()->getPrefixedText() );
- $htmlOut .= Xml::hidden( 'method', 'addNotice' );
+ $htmlOut .= Html::hidden( 'title',
$this->getTitle()->getPrefixedText() );
+ $htmlOut .= Html::hidden( 'method', 'addNotice' );
$htmlOut .= Xml::openElement( 'table', array (
'cellpadding' => 9 ) );
@@ -515,8 +515,8 @@
$htmlOut .= Xml::closeElement( 'tr' );
$htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'change', 'weight' );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'change', 'weight' );
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
// Submit button
$htmlOut .= Xml::tags( 'div',
@@ -899,7 +899,7 @@
}
// Build Assigned banners HTML
- $htmlOut = Xml::hidden( 'change', 'weight' );
+ $htmlOut = Html::hidden( 'change', 'weight' );
$htmlOut .= Xml::fieldset( wfMsg(
'centralnotice-assigned-templates' ) );
$htmlOut .= Xml::openElement( 'table',
array(
Modified: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/CentralNotice/SpecialNoticeTemplate.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -221,7 +221,7 @@
$htmlOut .= Xml::openElement( 'fieldset', array( 'class' =>
'prefsection' ) );
$htmlOut .= Xml::openElement( 'form', array( 'method' =>
'post', 'onsubmit' => 'return validateBannerForm(this)' ) );
$htmlOut .= Xml::element( 'h2', null, wfMsg(
'centralnotice-add-template' ) );
- $htmlOut .= Xml::hidden( 'wpMethod', 'addTemplate' );
+ $htmlOut .= Html::hidden( 'wpMethod', 'addTemplate' );
$htmlOut .= Xml::tags( 'p', null,
Xml::inputLabel( wfMsg( 'centralnotice-banner-name' ),
'templateName', 'templateName', 25, $wgRequest->getVal( 'templateName' ) )
);
@@ -260,7 +260,7 @@
$htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20 );
$htmlOut .= Xml::closeElement( 'fieldset' );
- $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
// Submit button
$htmlOut .= Xml::tags( 'div',
@@ -426,9 +426,9 @@
$htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::hidden(
'wpUserLanguage', $wpUserLang );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
- $htmlOut .= Xml::tags( 'div',
+ $htmlOut .= Html::hidden(
'wpUserLanguage', $wpUserLang );
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Xml::tags( 'div',
array( 'class' => 'cn-buttons'
),
Xml::submitButton( wfMsg(
'centralnotice-modify' ), array( 'name' => 'update' ) )
);
@@ -460,7 +460,7 @@
Xml::tags( 'td', null,
$sk->makeLinkObj( $newPage, wfMsgHtml(
'centralnotice-preview-all-template-translations' ),
"template=$currentTemplate&wpUserLanguage=all" ) )
);
$htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
$htmlOut .= Xml::closeElement( 'fieldset' );
$htmlOut .= Xml::closeElement( 'form' );
}
@@ -468,7 +468,7 @@
// Show edit form
if ( $this->editable ) {
$htmlOut .= Xml::openElement( 'form', array(
'method' => 'post', 'onsubmit' => 'return validateBannerForm(this)' ) );
- $htmlOut .= Xml::hidden( 'wpMethod',
'editTemplate' );
+ $htmlOut .= Html::hidden( 'wpMethod',
'editTemplate' );
}
// If there was an error, we'll need to restore the
state of the form
@@ -508,8 +508,8 @@
$htmlOut .= Xml::textarea( 'templateBody', $body, 60,
20, $readonly );
$htmlOut .= Xml::closeElement( 'fieldset' );
if ( $this->editable ) {
- $htmlOut .= Xml::hidden( 'mainform', 'true' );
// Indicate which form was submitted
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'mainform', 'true' );
// Indicate which form was submitted
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
$htmlOut .= Xml::tags( 'div',
array( 'class' => 'cn-buttons' ),
Xml::submitButton( wfMsg(
'centralnotice-save-banner' ) )
@@ -531,11 +531,11 @@
$htmlOut .= Xml::openElement( 'tr' );
$htmlOut .= Xml::inputLabel( wfMsg(
'centralnotice-clone-name' ), 'newTemplate', 'newTemplate', '25' );
$htmlOut .= Xml::submitButton( wfMsg(
'centralnotice-clone' ), array ( 'id' => 'clone' ) );
- $htmlOut .= Xml::hidden( 'oldTemplate',
$currentTemplate );
+ $htmlOut .= Html::hidden( 'oldTemplate',
$currentTemplate );
$htmlOut .= Xml::closeElement( 'tr' );
$htmlOut .= Xml::closeElement( 'table' );
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
$htmlOut .= Xml::closeElement( 'fieldset' );
$htmlOut .= Xml::closeElement( 'form' );
}
Modified: trunk/extensions/CentralNotice/TemplatePager.php
===================================================================
--- trunk/extensions/CentralNotice/TemplatePager.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/CentralNotice/TemplatePager.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -101,7 +101,7 @@
$htmlOut = '';
$htmlOut .= Xml::closeElement( 'table' );
if ( $this->editable ) {
- $htmlOut .= Xml::hidden( 'authtoken',
$wgUser->editToken() );
+ $htmlOut .= Html::hidden( 'authtoken',
$wgUser->editToken() );
$htmlOut .= Xml::tags( 'div',
array( 'class' => 'cn-buttons' ),
Xml::submitButton( wfMsg(
'centralnotice-modify' ) )
Modified: trunk/extensions/CheckUser/CheckUser.php
===================================================================
--- trunk/extensions/CheckUser/CheckUser.php 2010-10-29 15:30:54 UTC (rev
75645)
+++ trunk/extensions/CheckUser/CheckUser.php 2010-10-29 15:32:44 UTC (rev
75646)
@@ -188,7 +188,6 @@
if ( !$wgSecretKey || $from->name == $to->name ) {
return true;
}
- wfLoadExtensionMessages( 'CheckUser' );
$userFrom = User::newFromName( $from->name );
$userTo = User::newFromName( $to->name );
$hash = md5( $userTo->getEmail() . $userTo->getId() . $wgSecretKey );
@@ -232,7 +231,6 @@
* Saves user data into the cu_changes table
*/
function efUpdateAutoCreateData( $user ) {
- wfLoadExtensionMessages( 'CheckUser' );
// Get IP
$ip = wfGetIP();
// Get XFF header
@@ -415,7 +413,6 @@
function efLoadCheckUserLink( $id, $nt, &$links ) {
global $wgUser;
if ( $wgUser->isAllowed( 'checkuser' ) ) {
- wfLoadExtensionMessages( 'CheckUser' );
$links[] = $wgUser->getSkin()->makeKnownLinkObj(
SpecialPage::getTitleFor( 'CheckUser' ),
wfMsgHtml( 'checkuser-contribs' ),
Modified: trunk/extensions/Cite/Cite_body.php
===================================================================
--- trunk/extensions/Cite/Cite_body.php 2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/Cite/Cite_body.php 2010-10-29 15:32:44 UTC (rev 75646)
@@ -152,7 +152,6 @@
* @return string
*/
function ref( $str, $argv, $parser ) {
- wfLoadExtensionMessages( 'Cite' );
if ( $this->mInCite ) {
return htmlspecialchars( "<ref>$str</ref>" );
} else {
@@ -489,7 +488,6 @@
* @return string
*/
function references( $str, $argv, $parser ) {
- wfLoadExtensionMessages( 'Cite' );
if ( $this->mInCite || $this->mInReferences ) {
if ( is_null( $str ) ) {
return htmlspecialchars( "<references/>" );
Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/Collection/Collection.body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -486,8 +486,6 @@
global $wgUser;
global $wgCommunityCollectionNamespace;
- wfLoadExtensionMessages( 'CollectionCore' );
-
$result = array();
$t = wfMsgForContent( 'coll-user_book_prefix',
$wgUser->getName() );
@@ -931,8 +929,6 @@
global $wgRightsText;
global $wgRightsUrl;
- wfLoadExtensionMessages( 'Collection' );
-
$licenseInfo = array(
"type" => "license",
);
Modified: trunk/extensions/Collection/Collection.hooks.php
===================================================================
--- trunk/extensions/Collection/Collection.hooks.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/Collection/Collection.hooks.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -95,8 +95,6 @@
return false;
}
- wfLoadExtensionMessages( 'CollectionCore' );
-
$sk = $wgUser->getSkin();
$out = Xml::element( 'ul', array( 'id' =>
'collectionPortletList' ), null );
@@ -242,8 +240,6 @@
global $wgTitle;
global $wgUser;
- wfLoadExtensionMessages( 'CollectionCore' );
-
$sk = $wgUser->getSkin();
$jsPath = "$wgScriptPath/extensions/Collection/js";
$imagePath = "$wgScriptPath/extensions/Collection/images";
@@ -386,8 +382,6 @@
global $wgUser;
global $wgScriptPath;
- wfLoadExtensionMessages( 'CollectionCore' );
-
$sk = $wgUser->getSkin();
$imagePath = "$wgScriptPath/extensions/Collection/images";
Modified: trunk/extensions/Collection/Collection.php
===================================================================
--- trunk/extensions/Collection/Collection.php 2010-10-29 15:30:54 UTC (rev
75645)
+++ trunk/extensions/Collection/Collection.php 2010-10-29 15:32:44 UTC (rev
75646)
@@ -253,9 +253,6 @@
$wgAjaxExportList[] = 'wfAjaxCollectionGetBookCreatorBoxContent';
function wfAjaxCollectionGetItemList() {
- wfLoadExtensionMessages( 'CollectionCore' );
- wfLoadExtensionMessages( 'Collection' );
-
$collection = $_SESSION['wsCollection'];
$template = new CollectionListTemplate();
@@ -331,7 +328,6 @@
function wfAjaxCollectionGetPopupData( $title ) {
global $wgScriptPath;
- wfLoadExtensionMessages( 'CollectionCore' );
$json = new Services_JSON();
$result = array();
$imagePath = "$wgScriptPath/extensions/Collection/images";
@@ -365,9 +361,6 @@
* @return AjaxResponse with JSON-encoded array including HTML fragment.
*/
function wfCollectionSuggestAction( $action, $article ) {
- wfLoadExtensionMessages( 'CollectionCore' );
- wfLoadExtensionMessages( 'Collection' );
-
$json = new Services_JSON();
$result = CollectionSuggest::refresh( $action, $article );
$undoLink = Xml::element( 'a',
@@ -412,9 +405,6 @@
$wgAjaxExportList[] = 'wfAjaxCollectionSuggestRemoveArticle';
function wfAjaxCollectionSuggestUndoArticle( $lastAction, $article ) {
- wfLoadExtensionMessages( 'CollectionCore' );
- wfLoadExtensionMessages( 'Collection' );
-
$json = new Services_JSON();
$result = CollectionSuggest::undo( $lastAction, $article );
$r = new AjaxResponse( $json->encode( $result ) );
Modified: trunk/extensions/ContactPage/SpecialContact.php
===================================================================
--- trunk/extensions/ContactPage/SpecialContact.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/ContactPage/SpecialContact.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -270,7 +270,7 @@
Xml::submitButton( wfMsg( 'emailsend'
), array( 'name' => 'wpSend', 'accesskey' => 's' ) ) .
'</td>
</tr>' .
- Xml::hidden( 'wpEditToken', $token ) .
+ Html::hidden( 'wpEditToken', $token ) .
Xml::closeElement( 'table' ) .
Xml::closeElement( 'fieldset' ) .
Xml::closeElement( 'form' );
Modified: trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php
===================================================================
--- trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -111,7 +111,6 @@
$plink = $skin->makeKnownLink( $nt->getPrefixedText(),
htmlspecialchars( $text ) );
- wfLoadExtensionMessages( 'CrossNamespaceLinks' );
return wfMsgExt( 'crossnamespacelinkstext', array( 'parsemag'
), $plink, $wgLang->formatNum( $result->namespace ), htmlspecialchars(
$wgLang->getNsText( $result->value ) ) );
}
}
Modified: trunk/extensions/Gadgets/Gadgets.php
===================================================================
--- trunk/extensions/Gadgets/Gadgets.php 2010-10-29 15:30:54 UTC (rev
75645)
+++ trunk/extensions/Gadgets/Gadgets.php 2010-10-29 15:32:44 UTC (rev
75646)
@@ -122,8 +122,6 @@
$gadgets = wfLoadGadgetsStructured();
if (!$gadgets) return true;
- wfLoadExtensionMessages( 'Gadgets' );
-
$options = array();
foreach( $gadgets as $section => $thisSection ) {
if ( $section !== '' ) {
Modified: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
===================================================================
--- trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/GlobalBlocking/GlobalBlocking.class.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -283,7 +283,6 @@
global $wgUser;
if ( GlobalBlocking::getUserBlockErrors( $wgUser, wfGetIp() ) )
{
- wfLoadExtensionMessages( 'GlobalBlocking' );
$error = wfMsg( 'globalblocking-blocked-nopassreset' );
return false;
}
@@ -308,7 +307,6 @@
return true;
}
- wfLoadExtensionMessages( 'GlobalBlocking' );
$msg[] = Html::rawElement(
'span',
array( 'class' => 'mw-globalblock-loglink plainlinks' ),
Modified: trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php
===================================================================
--- trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -176,7 +176,7 @@
'action' => $wgScript,
'name' => 'uluser',
'id' => 'mw-globalblock-form' ) );
- $form .= Xml::hidden( 'title',
SpecialPage::getTitleFor('GlobalBlock')->getPrefixedText() );
+ $form .= Html::hidden( 'title',
SpecialPage::getTitleFor('GlobalBlock')->getPrefixedText() );
$fields = array ();
@@ -259,7 +259,7 @@
$form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
if ($this->mModifyForm)
- $form .= Xml::hidden( 'wpModify', 1 );
+ $form .= Html::hidden( 'wpModify', 1 );
$form .= Xml::closeElement( 'form' );
$form .= Xml::closeElement( 'fieldset' );
Modified: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php
===================================================================
--- trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -42,7 +42,7 @@
$searchForm .= Xml::openElement( 'fieldset' ) .
Xml::element( 'legend', null, wfMsg(
'globalblocking-search-legend' ) );
$searchForm .= Xml::openElement( 'form', array( 'method' =>
'get', 'action' => $wgScript, 'name' => 'globalblocklist-search' ) );
- $searchForm .= Xml::hidden( 'title',
SpecialPage::getTitleFor('GlobalBlockList')->getPrefixedText() );
+ $searchForm .= Html::hidden( 'title',
SpecialPage::getTitleFor('GlobalBlockList')->getPrefixedText() );
if (is_array($errors) && count($errors)>0) {
$errorstr = '';
Modified: trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
===================================================================
--- trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -145,8 +145,8 @@
$form .= Xml::openElement( 'fieldset' ) . Xml::element(
'legend', null, wfMsg( 'globalblocking-whitelist-legend' ) );
$form .= Xml::openElement( 'form', array( 'method' => 'post',
'action' => $this->getTitle()->getFullURL(), 'name' => 'globalblock-whitelist'
) );
- $form .= Xml::hidden( 'title',
$this->getTitle()->getPrefixedText() );
- $form .= Xml::hidden( 'action', 'whitelist' );
+ $form .= Html::hidden( 'title',
$this->getTitle()->getPrefixedText() );
+ $form .= Html::hidden( 'action', 'whitelist' );
$fields = array();
@@ -156,7 +156,7 @@
$form .= Xml::buildForm( $fields,
'globalblocking-whitelist-submit' );
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
$form .= Xml::closeElement( 'form' );
$form .= Xml::closeElement( 'fieldset' );
Modified: trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
===================================================================
--- trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -109,8 +109,8 @@
$form .= Xml::openElement( 'fieldset' ) . Xml::element(
'legend', null, wfMsg( 'globalblocking-unblock-legend' ) );
$form .= Xml::openElement( 'form', array( 'method' => 'post',
'action' => $wgScript, 'name' => 'globalblock-unblock' ) );
- $form .= Xml::hidden( 'title',
$this->getTitle()->getPrefixedText() );
- $form .= Xml::hidden( 'action', 'unblock' );
+ $form .= Html::hidden( 'title',
$this->getTitle()->getPrefixedText() );
+ $form .= Html::hidden( 'action', 'unblock' );
$fields = array();
@@ -119,7 +119,7 @@
$form .= Xml::buildForm( $fields,
'globalblocking-unblock-submit' );
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
$form .= Xml::closeElement( 'form' );
$form .= Xml::closeElement( 'fieldset' );
Modified: trunk/extensions/InputBox/InputBox.classes.php
===================================================================
--- trunk/extensions/InputBox/InputBox.classes.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/InputBox/InputBox.classes.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -181,7 +181,7 @@
// Hidden fulltext param for IE (bug 17161)
if( $type == 'fulltext' ) {
- $htmlOut .= Xml::hidden( 'fulltext', 'Search' );
+ $htmlOut .= Html::hidden( 'fulltext', 'Search' );
}
$htmlOut .= Xml::closeElement( 'form' );
Modified: trunk/extensions/NewUserMessage/NewUserMessage.class.php
===================================================================
--- trunk/extensions/NewUserMessage/NewUserMessage.class.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/NewUserMessage/NewUserMessage.class.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -140,8 +140,6 @@
$talk = $user->getTalkPage();
if ( !$talk->exists() ) {
- wfLoadExtensionMessages( 'NewUserMessage' );
-
$subject = self::fetchSubject();
$text = self::fetchText();
$signature = self::fetchSignature();
@@ -177,7 +175,6 @@
* @param $names Array
*/
static function onUserGetReservedNames( &$names ) {
- wfLoadExtensionMessages( 'NewUserMessage' );
$names[] = 'msg:newusermessage-editor';
return true;
}
Modified: trunk/extensions/OggHandler/OggHandler_body.php
===================================================================
--- trunk/extensions/OggHandler/OggHandler_body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/OggHandler/OggHandler_body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -351,7 +351,6 @@
function getShortDesc( $file ) {
global $wgLang, $wgOggAudioTypes, $wgOggVideoTypes;
- wfLoadExtensionMessages( 'OggHandler' );
$streamTypes = $this->getStreamTypes( $file );
if ( !$streamTypes ) {
return parent::getShortDesc( $file );
@@ -370,7 +369,7 @@
function getLongDesc( $file ) {
global $wgLang, $wgOggVideoTypes, $wgOggAudioTypes;
- wfLoadExtensionMessages( 'OggHandler' );
+
$streamTypes = $this->getStreamTypes( $file );
if ( !$streamTypes ) {
$unpacked = $this->unpackMetadata( $file->getMetadata()
);
@@ -409,7 +408,6 @@
function getDimensionsString( $file ) {
global $wgLang;
- wfLoadExtensionMessages( 'OggHandler' );
if ( $file->getWidth() ) {
return wfMsg( 'video-dims', $wgLang->formatTimePeriod(
$this->getLength( $file ) ),
$wgLang->formatNum( $file->getWidth() ),
@@ -432,8 +430,6 @@
return;
}
- wfLoadExtensionMessages( 'OggHandler' );
-
$msgNames = array( 'ogg-play', 'ogg-pause', 'ogg-stop',
'ogg-no-player',
'ogg-player-videoElement', 'ogg-player-oggPlugin',
'ogg-player-cortado', 'ogg-player-vlc-mozilla',
'ogg-player-vlc-activex',
'ogg-player-quicktime-mozilla', 'ogg-player-quicktime-activex',
@@ -512,7 +508,6 @@
}
function toHtml( $options = array() ) {
- wfLoadExtensionMessages( 'OggHandler' );
if ( count( func_get_args() ) == 2 ) {
throw new MWException( __METHOD__ .' called in the old
style' );
}
Modified: trunk/extensions/Oversight/HideRevision_body.php
===================================================================
--- trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/Oversight/HideRevision_body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -185,13 +185,13 @@
function revisionFields() {
$out = '';
foreach( $this->mRevisions as $id ) {
- $out .= Xml::hidden( 'revision[]', $id );
+ $out .= Html::hidden( 'revision[]', $id );
}
if( $this->mTarget ) {
- $out .= Xml::hidden( 'target',
$this->mTarget->getPrefixedDbKey() );
+ $out .= Html::hidden( 'target',
$this->mTarget->getPrefixedDbKey() );
}
foreach( $this->mTimestamps as $timestamp ) {
- $out .= Xml::hidden( 'timestamp[]', wfTimestamp( TS_MW,
$timestamp ) );
+ $out .= Html::hidden( 'timestamp[]', wfTimestamp(
TS_MW, $timestamp ) );
}
return $out;
}
@@ -348,7 +348,6 @@
class SpecialOversight extends SpecialPage {
function __construct(){
- wfLoadExtensionMessages('HideRevision');
parent::__construct( 'Oversight', 'oversight' );
}
@@ -389,7 +388,7 @@
$wgOut->addHTML(
Xml::openElement( 'form', array( 'action' => $wgScript,
'method' => 'get', 'id' => 'mw-hiderevision-form' ) ) .
Xml::fieldset( wfMsg( 'oversight-legend' ) ) .
- Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
+ Html::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
Xml::inputLabel( wfMsg( 'oversight-oversighter' ),
'user', 'mw-oversight-user', 20, $user ) . ' ' .
Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ),
'page', 'mw-oversight-page', 25, $page ) . ' ' .
Xml::inputLabel( wfMsg( 'oversight-offender' ),
'author', 'mw-oversight-author', 20, $offender ) . ' ' .
Modified: trunk/extensions/ParserFunctions/ParserFunctions_body.php
===================================================================
--- trunk/extensions/ParserFunctions/ParserFunctions_body.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/ParserFunctions/ParserFunctions_body.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -288,7 +288,6 @@
if ( $current == '..' ) { // removing one level
if ( !count( $newExploded ) ) {
// attempted to access a node above
root node
- wfLoadExtensionMessages(
'ParserFunctions' );
return '<strong class="error">' .
wfMsgForContent( 'pfunc_rel2abs_invalid_depth', $fullPath ) . '</strong>';
}
// remove last level from the stack
@@ -460,12 +459,10 @@
# format the timestamp and return the result
if ( $invalidTime ) {
- wfLoadExtensionMessages( 'ParserFunctions' );
$result = '<strong class="error">' . wfMsgForContent(
'pfunc_time_error' ) . '</strong>';
} else {
$this->mTimeChars += strlen( $format );
if ( $this->mTimeChars > $this->mMaxTimeChars ) {
- wfLoadExtensionMessages( 'ParserFunctions' );
return '<strong class="error">' .
wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
} else {
$result = $wgContLang->sprintfDate( $format,
$ts );
@@ -521,8 +518,6 @@
// Generates error message. Called when string is too long.
private function tooLongError() {
global $wgPFStringLengthLimit, $wgContLang;
- wfLoadExtensionMessages( 'ParserFunctions' );
-
return '<strong class="error">' .
wfMsgExt( 'pfunc_string_too_long',
array( 'escape', 'parsemag', 'content' ),
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php
===================================================================
--- trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -115,7 +115,6 @@
# Revision being displayed
$id = $wgOut->getRevisionId();
# Load required messages
- wfLoadExtensionMessages( 'ReaderFeedback' );
$reviewTitle = SpecialPage::getTitleFor( 'ReaderFeedback' );
$action = $reviewTitle->getLocalUrl( 'action=submit' );
$form = Xml::openElement( 'form', array( 'method' => 'post',
'action' => $action,
@@ -149,12 +148,12 @@
'title' => wfMsg('readerfeedback-tt-review').'
['.wfMsg('readerfeedback-ak-review').']' )
);
# Hidden params
- $form .= Xml::hidden( 'title', $reviewTitle->getPrefixedText()
) . "\n";
- $form .= Xml::hidden( 'target', $title->getPrefixedDBKey() ) .
"\n";
- $form .= Xml::hidden( 'oldid', $id ) . "\n";
- $form .= Xml::hidden( 'validatedParams',
ReaderFeedbackPage::validationKey( $id, $wgUser->getId() ) );
- $form .= Xml::hidden( 'action', 'submit') . "\n";
- $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
"\n";
+ $form .= Html::hidden( 'title', $reviewTitle->getPrefixedText()
) . "\n";
+ $form .= Html::hidden( 'target', $title->getPrefixedDBKey() ) .
"\n";
+ $form .= Html::hidden( 'oldid', $id ) . "\n";
+ $form .= Html::hidden( 'validatedParams',
ReaderFeedbackPage::validationKey( $id, $wgUser->getId() ) );
+ $form .= Html::hidden( 'action', 'submit') . "\n";
+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
"\n";
# Honeypot input
$form .= Xml::input( 'commentary', 12, '', array('style' =>
'display:none;') ) . "\n";
$form .= Xml::closeElement( 'fieldset' );
@@ -171,7 +170,6 @@
global $wgTitle;
# Add rating tab
if( isset($wgTitle) && ReaderFeedback::isPageRateable($wgTitle)
) {
- wfLoadExtensionMessages( 'RatingHistory' );
$nav_urls['ratinghist'] = array(
'text' => wfMsg( 'ratinghistory-link' ),
'href' => $skintemplate->makeSpecialUrl(
'RatingHistory',
Modified: trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
===================================================================
--- trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -169,8 +169,7 @@
$rhist = SpecialPage::getTitleFor( 'RatingHistory' );
$graphLink = $rhist->getFullUrl(
'target='.$form->page->getPrefixedUrl() );
$talk = $form->page->getTalkPage();
-
- wfLoadExtensionMessages( 'RatingHistory' );
+
$tallyTable = ReaderFeedback::getVoteAggregates( $form->page,
31, $form->dims );
$dbw = wfGetDB( DB_MASTER );
Modified: trunk/extensions/Renameuser/Renameuser_body.php
===================================================================
--- trunk/extensions/Renameuser/Renameuser_body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/Renameuser/Renameuser_body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -160,7 +160,7 @@
</tr>" .
Xml::closeElement( 'table' ) .
Xml::closeElement( 'fieldset' ) .
- Xml::hidden( 'token', $token ) .
+ Html::hidden( 'token', $token ) .
Xml::closeElement( 'form' ) . "\n"
);
Modified: trunk/extensions/SecurePoll/includes/pages/VotePage.php
===================================================================
--- trunk/extensions/SecurePoll/includes/pages/VotePage.php 2010-10-29
15:30:54 UTC (rev 75645)
+++ trunk/extensions/SecurePoll/includes/pages/VotePage.php 2010-10-29
15:32:44 UTC (rev 75646)
@@ -241,8 +241,8 @@
$wgOut->addWikiText( $this->election->getMessage( 'jump-text' )
);
$wgOut->addHTML(
Xml::openElement( 'form', array( 'action' => $url,
'method' => 'post' ) ) .
- Xml::hidden( 'token',
SecurePoll_RemoteMWAuth::encodeToken( $wgUser->getToken() ) ) .
- Xml::hidden( 'id', $wgUser->getId() ) .
+ Html::hidden( 'token',
SecurePoll_RemoteMWAuth::encodeToken( $wgUser->getToken() ) ) .
+ Html::hidden( 'id', $wgUser->getId() ) .
Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
'</form>'
);
Modified: trunk/extensions/SiteMatrix/SiteMatrix_body.php
===================================================================
--- trunk/extensions/SiteMatrix/SiteMatrix_body.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/SiteMatrix/SiteMatrix_body.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -204,7 +204,6 @@
function execute( $par ) {
global $wgOut, $wgRequest, $wgLanguageNames;
- wfLoadExtensionMessages( 'SiteMatrix' );
$this->setHeaders();
$this->outputHeader();
Modified: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
===================================================================
--- trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2010-10-29 15:30:54 UTC (rev 75645)
+++ trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
2010-10-29 15:32:44 UTC (rev 75646)
@@ -310,7 +310,6 @@
*/
private static function initialise() {
if( !self::$initialised ) {
- wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
if( !class_exists( 'GeSHi' ) ) {
require( 'geshi/geshi.php' );
}
Modified: trunk/extensions/TorBlock/TorBlock.class.php
===================================================================
--- trunk/extensions/TorBlock/TorBlock.class.php 2010-10-29 15:30:54 UTC
(rev 75645)
+++ trunk/extensions/TorBlock/TorBlock.class.php 2010-10-29 15:32:44 UTC
(rev 75646)
@@ -256,7 +256,6 @@
return true;
}
- wfLoadExtensionMessages( 'TorBlock' );
$msg[] = Html::rawElement(
'span',
array( 'class' => 'mw-torblock-isexitnode' ),
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
