r75646 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r75645‎ | r75646 | r75647 >
Date:15:32, 29 October 2010
Author:reedy
Status:deferred (Comments)
Tags:
Comment:
More deprecated method call removals and updates
Modified paths:
  • /trunk/extensions/AbuseFilter/AbuseFilter.class.php (modified) (history)
  • /trunk/extensions/AbuseFilter/AbuseFilter.hooks.php (modified) (history)
  • /trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php (modified) (history)
  • /trunk/extensions/AntiSpoof/AntiSpoof.php (modified) (history)
  • /trunk/extensions/AntiSpoof/AntiSpoof_body.php (modified) (history)
  • /trunk/extensions/CategoryTree/CategoryTreePage.php (modified) (history)
  • /trunk/extensions/CentralAuth/CentralAuth.php (modified) (history)
  • /trunk/extensions/CentralAuth/CentralAuthHooks.php (modified) (history)
  • /trunk/extensions/CentralAuth/SpecialCentralAuth.php (modified) (history)
  • /trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php (modified) (history)
  • /trunk/extensions/CentralAuth/SpecialMergeAccount.php (modified) (history)
  • /trunk/extensions/CentralAuth/SpecialWikiSets.php (modified) (history)
  • /trunk/extensions/CentralNotice/SpecialCentralNotice.php (modified) (history)
  • /trunk/extensions/CentralNotice/SpecialNoticeTemplate.php (modified) (history)
  • /trunk/extensions/CentralNotice/TemplatePager.php (modified) (history)
  • /trunk/extensions/CheckUser/CheckUser.php (modified) (history)
  • /trunk/extensions/Cite/Cite_body.php (modified) (history)
  • /trunk/extensions/Collection/Collection.body.php (modified) (history)
  • /trunk/extensions/Collection/Collection.hooks.php (modified) (history)
  • /trunk/extensions/Collection/Collection.php (modified) (history)
  • /trunk/extensions/ContactPage/SpecialContact.php (modified) (history)
  • /trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php (modified) (history)
  • /trunk/extensions/Gadgets/Gadgets.php (modified) (history)
  • /trunk/extensions/GlobalBlocking/GlobalBlocking.class.php (modified) (history)
  • /trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php (modified) (history)
  • /trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php (modified) (history)
  • /trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php (modified) (history)
  • /trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php (modified) (history)
  • /trunk/extensions/InputBox/InputBox.classes.php (modified) (history)
  • /trunk/extensions/NewUserMessage/NewUserMessage.class.php (modified) (history)
  • /trunk/extensions/OggHandler/OggHandler_body.php (modified) (history)
  • /trunk/extensions/Oversight/HideRevision_body.php (modified) (history)
  • /trunk/extensions/ParserFunctions/ParserFunctions_body.php (modified) (history)
  • /trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php (modified) (history)
  • /trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php (modified) (history)
  • /trunk/extensions/Renameuser/Renameuser_body.php (modified) (history)
  • /trunk/extensions/SecurePoll/includes/pages/VotePage.php (modified) (history)
  • /trunk/extensions/SiteMatrix/SiteMatrix_body.php (modified) (history)
  • /trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php (modified) (history)
  • /trunk/extensions/TorBlock/TorBlock.class.php (modified) (history)

Diff [purge]

Index: trunk/extensions/ContactPage/SpecialContact.php
——@@ -270,7 +270,7 @@
271271 Xml::submitButton( wfMsg( 'emailsend' ), array( 'name' => 'wpSend', 'accesskey' => 's' ) ) .
272272 '</td>
273273 </tr>' .
274 - Xml::hidden( 'wpEditToken', $token ) .
 274+ Html::hidden( 'wpEditToken', $token ) .
275275 Xml::closeElement( 'table' ) .
276276 Xml::closeElement( 'fieldset' ) .
277277 Xml::closeElement( 'form' );
Index: trunk/extensions/Collection/Collection.php
——@@ -253,9 +253,6 @@
254254 $wgAjaxExportList[] = 'wfAjaxCollectionGetBookCreatorBoxContent';
255255
256256 function wfAjaxCollectionGetItemList() {
257 - wfLoadExtensionMessages( 'CollectionCore' );
258 - wfLoadExtensionMessages( 'Collection' );
259 -
260257 $collection = $_SESSION['wsCollection'];
261258
262259 $template = new CollectionListTemplate();
——@@ -331,7 +328,6 @@
332329 function wfAjaxCollectionGetPopupData( $title ) {
333330 global $wgScriptPath;
334331
335 - wfLoadExtensionMessages( 'CollectionCore' );
336332 $json = new Services_JSON();
337333 $result = array();
338334 $imagePath = "$wgScriptPath/extensions/Collection/images";
——@@ -365,9 +361,6 @@
366362 * @return AjaxResponse with JSON-encoded array including HTML fragment.
367363 */
368364 function wfCollectionSuggestAction( $action, $article ) {
369 - wfLoadExtensionMessages( 'CollectionCore' );
370 - wfLoadExtensionMessages( 'Collection' );
371 -
372365 $json = new Services_JSON();
373366 $result = CollectionSuggest::refresh( $action, $article );
374367 $undoLink = Xml::element( 'a',
——@@ -412,9 +405,6 @@
413406 $wgAjaxExportList[] = 'wfAjaxCollectionSuggestRemoveArticle';
414407
415408 function wfAjaxCollectionSuggestUndoArticle( $lastAction, $article ) {
416 - wfLoadExtensionMessages( 'CollectionCore' );
417 - wfLoadExtensionMessages( 'Collection' );
418 -
419409 $json = new Services_JSON();
420410 $result = CollectionSuggest::undo( $lastAction, $article );
421411 $r = new AjaxResponse( $json->encode( $result ) );
Index: trunk/extensions/Collection/Collection.hooks.php
——@@ -95,8 +95,6 @@
9696 return false;
9797 }
9898
99 - wfLoadExtensionMessages( 'CollectionCore' );
100 -
10199 $sk = $wgUser->getSkin();
102100
103101 $out = Xml::element( 'ul', array( 'id' => 'collectionPortletList' ), null );
——@@ -242,8 +240,6 @@
243241 global $wgTitle;
244242 global $wgUser;
245243
246 - wfLoadExtensionMessages( 'CollectionCore' );
247 -
248244 $sk = $wgUser->getSkin();
249245 $jsPath = "$wgScriptPath/extensions/Collection/js";
250246 $imagePath = "$wgScriptPath/extensions/Collection/images";
——@@ -386,8 +382,6 @@
387383 global $wgUser;
388384 global $wgScriptPath;
389385
390 - wfLoadExtensionMessages( 'CollectionCore' );
391 -
392386 $sk = $wgUser->getSkin();
393387 $imagePath = "$wgScriptPath/extensions/Collection/images";
394388
Index: trunk/extensions/Collection/Collection.body.php
——@@ -486,8 +486,6 @@
487487 global $wgUser;
488488 global $wgCommunityCollectionNamespace;
489489
490 - wfLoadExtensionMessages( 'CollectionCore' );
491 -
492490 $result = array();
493491
494492 $t = wfMsgForContent( 'coll-user_book_prefix', $wgUser->getName() );
——@@ -931,8 +929,6 @@
932930 global $wgRightsText;
933931 global $wgRightsUrl;
934932
935 - wfLoadExtensionMessages( 'Collection' );
936 -
937933 $licenseInfo = array(
938934 "type" => "license",
939935 );
Index: trunk/extensions/Renameuser/Renameuser_body.php
——@@ -160,7 +160,7 @@
161161 </tr>" .
162162 Xml::closeElement( 'table' ) .
163163 Xml::closeElement( 'fieldset' ) .
164 - Xml::hidden( 'token', $token ) .
 164+ Html::hidden( 'token', $token ) .
165165 Xml::closeElement( 'form' ) . "\n"
166166 );
167167
Index: trunk/extensions/NewUserMessage/NewUserMessage.class.php
——@@ -140,8 +140,6 @@
141141 $talk = $user->getTalkPage();
142142
143143 if ( !$talk->exists() ) {
144 - wfLoadExtensionMessages( 'NewUserMessage' );
145 -
146144 $subject = self::fetchSubject();
147145 $text = self::fetchText();
148146 $signature = self::fetchSignature();
——@@ -177,7 +175,6 @@
178176 * @param $names Array
179177 */
180178 static function onUserGetReservedNames( &$names ) {
181 - wfLoadExtensionMessages( 'NewUserMessage' );
182179 $names[] = 'msg:newusermessage-editor';
183180 return true;
184181 }
Index: trunk/extensions/AntiSpoof/AntiSpoof_body.php
——@@ -262,7 +262,6 @@
263263
264264 # TODO: does too much in one routine, refactor...
265265 public static function checkUnicodeString( $testName ) {
266 - wfLoadExtensionMessages( 'AntiSpoof' );
267266 # Start with some sanity checking
268267 if ( !is_string( $testName ) ) {
269268 return array( "ERROR", wfMsg( 'antispoof-badtype' ) );
Index: trunk/extensions/AntiSpoof/AntiSpoof.php
——@@ -113,7 +113,6 @@
114114 function asUserCreateFormHook( &$template ) {
115115 global $wgRequest, $wgAntiSpoofAccounts, $wgUser;
116116
117 - wfLoadExtensionMessages( 'AntiSpoof' );
118117
119118 if ( $wgAntiSpoofAccounts && $wgUser->isAllowed( 'override-antispoof' ) )
120119 $template->addInputItem( 'wpIgnoreAntiSpoof',
Index: trunk/extensions/Oversight/HideRevision_body.php
——@@ -185,13 +185,13 @@
186186 function revisionFields() {
187187 $out = '';
188188 foreach( $this->mRevisions as $id ) {
189 - $out .= Xml::hidden( 'revision[]', $id );
 189+ $out .= Html::hidden( 'revision[]', $id );
190190 }
191191 if( $this->mTarget ) {
192 - $out .= Xml::hidden( 'target', $this->mTarget->getPrefixedDbKey() );
 192+ $out .= Html::hidden( 'target', $this->mTarget->getPrefixedDbKey() );
193193 }
194194 foreach( $this->mTimestamps as $timestamp ) {
195 - $out .= Xml::hidden( 'timestamp[]', wfTimestamp( TS_MW, $timestamp ) );
 195+ $out .= Html::hidden( 'timestamp[]', wfTimestamp( TS_MW, $timestamp ) );
196196 }
197197 return $out;
198198 }
——@@ -348,7 +348,6 @@
349349 class SpecialOversight extends SpecialPage {
350350
351351 function __construct(){
352 - wfLoadExtensionMessages('HideRevision');
353352 parent::__construct( 'Oversight', 'oversight' );
354353 }
355354
——@@ -389,7 +388,7 @@
390389 $wgOut->addHTML(
391390 Xml::openElement( 'form', array( 'action' => $wgScript, 'method' => 'get', 'id' => 'mw-hiderevision-form' ) ) .
392391 Xml::fieldset( wfMsg( 'oversight-legend' ) ) .
393 - Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
 392+ Html::hidden( 'title', $wgTitle->getPrefixedDbKey() ) .
394393 Xml::inputLabel( wfMsg( 'oversight-oversighter' ), 'user', 'mw-oversight-user', 20, $user ) . ' ' .
395394 Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-oversight-page', 25, $page ) . ' ' .
396395 Xml::inputLabel( wfMsg( 'oversight-offender' ), 'author', 'mw-oversight-author', 20, $offender ) . ' ' .
Index: trunk/extensions/OggHandler/OggHandler_body.php
——@@ -351,7 +351,6 @@
352352
353353 function getShortDesc( $file ) {
354354 global $wgLang, $wgOggAudioTypes, $wgOggVideoTypes;
355 - wfLoadExtensionMessages( 'OggHandler' );
356355 $streamTypes = $this->getStreamTypes( $file );
357356 if ( !$streamTypes ) {
358357 return parent::getShortDesc( $file );
——@@ -370,7 +369,7 @@
371370
372371 function getLongDesc( $file ) {
373372 global $wgLang, $wgOggVideoTypes, $wgOggAudioTypes;
374 - wfLoadExtensionMessages( 'OggHandler' );
 373+
375374 $streamTypes = $this->getStreamTypes( $file );
376375 if ( !$streamTypes ) {
377376 $unpacked = $this->unpackMetadata( $file->getMetadata() );
——@@ -409,7 +408,6 @@
410409
411410 function getDimensionsString( $file ) {
412411 global $wgLang;
413 - wfLoadExtensionMessages( 'OggHandler' );
414412 if ( $file->getWidth() ) {
415413 return wfMsg( 'video-dims', $wgLang->formatTimePeriod( $this->getLength( $file ) ),
416414 $wgLang->formatNum( $file->getWidth() ),
——@@ -432,8 +430,6 @@
433431 return;
434432 }
435433
436 - wfLoadExtensionMessages( 'OggHandler' );
437 -
438434 $msgNames = array( 'ogg-play', 'ogg-pause', 'ogg-stop', 'ogg-no-player',
439435 'ogg-player-videoElement', 'ogg-player-oggPlugin', 'ogg-player-cortado', 'ogg-player-vlc-mozilla',
440436 'ogg-player-vlc-activex', 'ogg-player-quicktime-mozilla', 'ogg-player-quicktime-activex',
——@@ -512,7 +508,6 @@
513509 }
514510
515511 function toHtml( $options = array() ) {
516 - wfLoadExtensionMessages( 'OggHandler' );
517512 if ( count( func_get_args() ) == 2 ) {
518513 throw new MWException( __METHOD__ .' called in the old style' );
519514 }
Index: trunk/extensions/TorBlock/TorBlock.class.php
——@@ -256,7 +256,6 @@
257257 return true;
258258 }
259259
260 - wfLoadExtensionMessages( 'TorBlock' );
261260 $msg[] = Html::rawElement(
262261 'span',
263262 array( 'class' => 'mw-torblock-isexitnode' ),
Index: trunk/extensions/CentralNotice/TemplatePager.php
——@@ -101,7 +101,7 @@
102102 $htmlOut = '';
103103 $htmlOut .= Xml::closeElement( 'table' );
104104 if ( $this->editable ) {
105 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 105+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
106106 $htmlOut .= Xml::tags( 'div',
107107 array( 'class' => 'cn-buttons' ),
108108 Xml::submitButton( wfMsg( 'centralnotice-modify' ) )
Index: trunk/extensions/CentralNotice/SpecialCentralNotice.php
——@@ -474,8 +474,8 @@
475475 // Form for adding a campaign
476476 $htmlOut .= Xml::openElement( 'form', array( 'method' => 'post' ) );
477477 $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-add-notice' ) );
478 - $htmlOut .= Xml::hidden( 'title', $this->getTitle()->getPrefixedText() );
479 - $htmlOut .= Xml::hidden( 'method', 'addNotice' );
 478+ $htmlOut .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() );
 479+ $htmlOut .= Html::hidden( 'method', 'addNotice' );
480480
481481 $htmlOut .= Xml::openElement( 'table', array ( 'cellpadding' => 9 ) );
482482
——@@ -515,8 +515,8 @@
516516 $htmlOut .= Xml::closeElement( 'tr' );
517517
518518 $htmlOut .= Xml::closeElement( 'table' );
519 - $htmlOut .= Xml::hidden( 'change', 'weight' );
520 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 519+ $htmlOut .= Html::hidden( 'change', 'weight' );
 520+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
521521
522522 // Submit button
523523 $htmlOut .= Xml::tags( 'div',
——@@ -899,7 +899,7 @@
900900 }
901901
902902 // Build Assigned banners HTML
903 - $htmlOut = Xml::hidden( 'change', 'weight' );
 903+ $htmlOut = Html::hidden( 'change', 'weight' );
904904 $htmlOut .= Xml::fieldset( wfMsg( 'centralnotice-assigned-templates' ) );
905905 $htmlOut .= Xml::openElement( 'table',
906906 array(
Index: trunk/extensions/CentralNotice/SpecialNoticeTemplate.php
——@@ -221,7 +221,7 @@
222222 $htmlOut .= Xml::openElement( 'fieldset', array( 'class' => 'prefsection' ) );
223223 $htmlOut .= Xml::openElement( 'form', array( 'method' => 'post', 'onsubmit' => 'return validateBannerForm(this)' ) );
224224 $htmlOut .= Xml::element( 'h2', null, wfMsg( 'centralnotice-add-template' ) );
225 - $htmlOut .= Xml::hidden( 'wpMethod', 'addTemplate' );
 225+ $htmlOut .= Html::hidden( 'wpMethod', 'addTemplate' );
226226 $htmlOut .= Xml::tags( 'p', null,
227227 Xml::inputLabel( wfMsg( 'centralnotice-banner-name' ), 'templateName', 'templateName', 25, $wgRequest->getVal( 'templateName' ) )
228228 );
——@@ -260,7 +260,7 @@
261261
262262 $htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20 );
263263 $htmlOut .= Xml::closeElement( 'fieldset' );
264 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 264+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
265265
266266 // Submit button
267267 $htmlOut .= Xml::tags( 'div',
——@@ -426,9 +426,9 @@
427427 $htmlOut .= Xml::closeElement( 'table' );
428428
429429 if ( $this->editable ) {
430 - $htmlOut .= Xml::hidden( 'wpUserLanguage', $wpUserLang );
431 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
432 - $htmlOut .= Xml::tags( 'div',
 430+ $htmlOut .= Html::hidden( 'wpUserLanguage', $wpUserLang );
 431+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
 432+ $htmlOut .= Xml::tags( 'div',
433433 array( 'class' => 'cn-buttons' ),
434434 Xml::submitButton( wfMsg( 'centralnotice-modify' ), array( 'name' => 'update' ) )
435435 );
——@@ -460,7 +460,7 @@
461461 Xml::tags( 'td', null, $sk->makeLinkObj( $newPage, wfMsgHtml( 'centralnotice-preview-all-template-translations' ), "template=$currentTemplate&wpUserLanguage=all" ) )
462462 );
463463 $htmlOut .= Xml::closeElement( 'table' );
464 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 464+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
465465 $htmlOut .= Xml::closeElement( 'fieldset' );
466466 $htmlOut .= Xml::closeElement( 'form' );
467467 }
——@@ -468,7 +468,7 @@
469469 // Show edit form
470470 if ( $this->editable ) {
471471 $htmlOut .= Xml::openElement( 'form', array( 'method' => 'post', 'onsubmit' => 'return validateBannerForm(this)' ) );
472 - $htmlOut .= Xml::hidden( 'wpMethod', 'editTemplate' );
 472+ $htmlOut .= Html::hidden( 'wpMethod', 'editTemplate' );
473473 }
474474
475475 // If there was an error, we'll need to restore the state of the form
——@@ -508,8 +508,8 @@
509509 $htmlOut .= Xml::textarea( 'templateBody', $body, 60, 20, $readonly );
510510 $htmlOut .= Xml::closeElement( 'fieldset' );
511511 if ( $this->editable ) {
512 - $htmlOut .= Xml::hidden( 'mainform', 'true' ); // Indicate which form was submitted
513 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 512+ $htmlOut .= Html::hidden( 'mainform', 'true' ); // Indicate which form was submitted
 513+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
514514 $htmlOut .= Xml::tags( 'div',
515515 array( 'class' => 'cn-buttons' ),
516516 Xml::submitButton( wfMsg( 'centralnotice-save-banner' ) )
——@@ -531,11 +531,11 @@
532532 $htmlOut .= Xml::openElement( 'tr' );
533533 $htmlOut .= Xml::inputLabel( wfMsg( 'centralnotice-clone-name' ), 'newTemplate', 'newTemplate', '25' );
534534 $htmlOut .= Xml::submitButton( wfMsg( 'centralnotice-clone' ), array ( 'id' => 'clone' ) );
535 - $htmlOut .= Xml::hidden( 'oldTemplate', $currentTemplate );
 535+ $htmlOut .= Html::hidden( 'oldTemplate', $currentTemplate );
536536
537537 $htmlOut .= Xml::closeElement( 'tr' );
538538 $htmlOut .= Xml::closeElement( 'table' );
539 - $htmlOut .= Xml::hidden( 'authtoken', $wgUser->editToken() );
 539+ $htmlOut .= Html::hidden( 'authtoken', $wgUser->editToken() );
540540 $htmlOut .= Xml::closeElement( 'fieldset' );
541541 $htmlOut .= Xml::closeElement( 'form' );
542542 }
Index: trunk/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
——@@ -310,7 +310,6 @@
311311 */
312312 private static function initialise() {
313313 if( !self::$initialised ) {
314 - wfLoadExtensionMessages( 'SyntaxHighlight_GeSHi' );
315314 if( !class_exists( 'GeSHi' ) ) {
316315 require( 'geshi/geshi.php' );
317316 }
Index: trunk/extensions/GlobalBlocking/SpecialRemoveGlobalBlock.php
——@@ -109,8 +109,8 @@
110110 $form .= Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'globalblocking-unblock-legend' ) );
111111 $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $wgScript, 'name' => 'globalblock-unblock' ) );
112112
113 - $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedText() );
114 - $form .= Xml::hidden( 'action', 'unblock' );
 113+ $form .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() );
 114+ $form .= Html::hidden( 'action', 'unblock' );
115115
116116 $fields = array();
117117
——@@ -119,7 +119,7 @@
120120
121121 $form .= Xml::buildForm( $fields, 'globalblocking-unblock-submit' );
122122
123 - $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 123+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
124124
125125 $form .= Xml::closeElement( 'form' );
126126 $form .= Xml::closeElement( 'fieldset' );
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlock.php
——@@ -176,7 +176,7 @@
177177 'action' => $wgScript,
178178 'name' => 'uluser',
179179 'id' => 'mw-globalblock-form' ) );
180 - $form .= Xml::hidden( 'title', SpecialPage::getTitleFor('GlobalBlock')->getPrefixedText() );
 180+ $form .= Html::hidden( 'title', SpecialPage::getTitleFor('GlobalBlock')->getPrefixedText() );
181181
182182 $fields = array ();
183183
——@@ -259,7 +259,7 @@
260260
261261 $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
262262 if ($this->mModifyForm)
263 - $form .= Xml::hidden( 'wpModify', 1 );
 263+ $form .= Html::hidden( 'wpModify', 1 );
264264
265265 $form .= Xml::closeElement( 'form' );
266266 $form .= Xml::closeElement( 'fieldset' );
Index: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php
——@@ -283,7 +283,6 @@
284284 global $wgUser;
285285
286286 if ( GlobalBlocking::getUserBlockErrors( $wgUser, wfGetIp() ) ) {
287 - wfLoadExtensionMessages( 'GlobalBlocking' );
288287 $error = wfMsg( 'globalblocking-blocked-nopassreset' );
289288 return false;
290289 }
——@@ -308,7 +307,6 @@
309308 return true;
310309 }
311310
312 - wfLoadExtensionMessages( 'GlobalBlocking' );
313311 $msg[] = Html::rawElement(
314312 'span',
315313 array( 'class' => 'mw-globalblock-loglink plainlinks' ),
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php
——@@ -145,8 +145,8 @@
146146 $form .= Xml::openElement( 'fieldset' ) . Xml::element( 'legend', null, wfMsg( 'globalblocking-whitelist-legend' ) );
147147 $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getFullURL(), 'name' => 'globalblock-whitelist' ) );
148148
149 - $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedText() );
150 - $form .= Xml::hidden( 'action', 'whitelist' );
 149+ $form .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() );
 150+ $form .= Html::hidden( 'action', 'whitelist' );
151151
152152 $fields = array();
153153
——@@ -156,7 +156,7 @@
157157
158158 $form .= Xml::buildForm( $fields, 'globalblocking-whitelist-submit' );
159159
160 - $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 160+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
161161
162162 $form .= Xml::closeElement( 'form' );
163163 $form .= Xml::closeElement( 'fieldset' );
Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php
——@@ -42,7 +42,7 @@
4343 $searchForm .= Xml::openElement( 'fieldset' ) .
4444 Xml::element( 'legend', null, wfMsg( 'globalblocking-search-legend' ) );
4545 $searchForm .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'name' => 'globalblocklist-search' ) );
46 - $searchForm .= Xml::hidden( 'title', SpecialPage::getTitleFor('GlobalBlockList')->getPrefixedText() );
 46+ $searchForm .= Html::hidden( 'title', SpecialPage::getTitleFor('GlobalBlockList')->getPrefixedText() );
4747
4848 if (is_array($errors) && count($errors)>0) {
4949 $errorstr = '';
Index: trunk/extensions/Gadgets/Gadgets.php
——@@ -122,8 +122,6 @@
123123 $gadgets = wfLoadGadgetsStructured();
124124 if (!$gadgets) return true;
125125
126 - wfLoadExtensionMessages( 'Gadgets' );
127 -
128126 $options = array();
129127 foreach( $gadgets as $section => $thisSection ) {
130128 if ( $section !== '' ) {
Index: trunk/extensions/ParserFunctions/ParserFunctions_body.php
——@@ -288,7 +288,6 @@
289289 if ( $current == '..' ) { // removing one level
290290 if ( !count( $newExploded ) ) {
291291 // attempted to access a node above root node
292 - wfLoadExtensionMessages( 'ParserFunctions' );
293292 return '<strong class="error">' . wfMsgForContent( 'pfunc_rel2abs_invalid_depth', $fullPath ) . '</strong>';
294293 }
295294 // remove last level from the stack
——@@ -460,12 +459,10 @@
461460
462461 # format the timestamp and return the result
463462 if ( $invalidTime ) {
464 - wfLoadExtensionMessages( 'ParserFunctions' );
465463 $result = '<strong class="error">' . wfMsgForContent( 'pfunc_time_error' ) . '</strong>';
466464 } else {
467465 $this->mTimeChars += strlen( $format );
468466 if ( $this->mTimeChars > $this->mMaxTimeChars ) {
469 - wfLoadExtensionMessages( 'ParserFunctions' );
470467 return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>';
471468 } else {
472469 $result = $wgContLang->sprintfDate( $format, $ts );
——@@ -521,8 +518,6 @@
522519 // Generates error message. Called when string is too long.
523520 private function tooLongError() {
524521 global $wgPFStringLengthLimit, $wgContLang;
525 - wfLoadExtensionMessages( 'ParserFunctions' );
526 -
527522 return '<strong class="error">' .
528523 wfMsgExt( 'pfunc_string_too_long',
529524 array( 'escape', 'parsemag', 'content' ),
Index: trunk/extensions/Cite/Cite_body.php
——@@ -152,7 +152,6 @@
153153 * @return string
154154 */
155155 function ref( $str, $argv, $parser ) {
156 - wfLoadExtensionMessages( 'Cite' );
157156 if ( $this->mInCite ) {
158157 return htmlspecialchars( "<ref>$str</ref>" );
159158 } else {
——@@ -489,7 +488,6 @@
490489 * @return string
491490 */
492491 function references( $str, $argv, $parser ) {
493 - wfLoadExtensionMessages( 'Cite' );
494492 if ( $this->mInCite || $this->mInReferences ) {
495493 if ( is_null( $str ) ) {
496494 return htmlspecialchars( "<references/>" );
Index: trunk/extensions/SiteMatrix/SiteMatrix_body.php
——@@ -204,7 +204,6 @@
205205
206206 function execute( $par ) {
207207 global $wgOut, $wgRequest, $wgLanguageNames;
208 - wfLoadExtensionMessages( 'SiteMatrix' );
209208
210209 $this->setHeaders();
211210 $this->outputHeader();
Index: trunk/extensions/CategoryTree/CategoryTreePage.php
——@@ -109,7 +109,7 @@
110110 $wgOut->addHTML( Xml::openElement( 'form', array( 'name' => 'categorytree', 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-categorytree-form' ) ) );
111111 $wgOut->addHTML( Xml::openElement( 'fieldset' ) );
112112 $wgOut->addHTML( Xml::element( 'legend', null, wfMsgNoTrans( 'categorytree-legend' ) ) );
113 - $wgOut->addHTML( Xml::hidden( 'title', $thisTitle->getPrefixedDbKey() ) );
 113+ $wgOut->addHTML( Xml::Html( 'title', $thisTitle->getPrefixedDbKey() ) );
114114 $wgOut->addHTML( Xml::inputLabel( wfMsgNoTrans( 'categorytree-category' ), 'target', 'target', 20, $this->target ) . ' ' );
115115 $wgOut->addHTML( Xml::openElement( 'select', array( 'name' => 'mode' ) ) );
116116 $wgOut->addHTML( Xml::option( wfMsgNoTrans( 'categorytree-mode-categories' ), 'categories', $mode == CT_MODE_CATEGORIES ? true : false ) );
Index: trunk/extensions/CentralAuth/SpecialWikiSets.php
——@@ -141,7 +141,7 @@
142142
143143 $wgOut->addHTML( Xml::buildForm( $form, 'centralauth-editset-submit' ) );
144144
145 - $edittoken = Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 145+ $edittoken = Html::hidden( 'wpEditToken', $wgUser->editToken() );
146146 $wgOut->addHTML( "<p>{$edittoken}</p></form></fieldset>" );
147147 } else {
148148 $form = array();
——@@ -185,7 +185,7 @@
186186 $legend = wfMsgHtml( 'centralauth-editset-legend-delete', $set->getName() );
187187 $form = array( 'centralauth-editset-reason' => Xml::input( 'wpReason' ) );
188188 $url = htmlspecialchars( SpecialPage::getTitleFor( 'WikiSets', "delete/{$subpage}" )->getLocalUrl() );
189 - $edittoken = Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 189+ $edittoken = Html::hidden( 'wpEditToken', $wgUser->editToken() );
190190
191191 $wgOut->addHTML( "<fieldset><legend>{$legend}</legend><form action='{$url}' method='post'>" );
192192 $wgOut->addHTML( Xml::buildForm( $form, 'centralauth-editset-submit-delete' ) );
Index: trunk/extensions/CentralAuth/SpecialGlobalGroupPermissions.php
——@@ -96,7 +96,7 @@
9797 $html = Xml::fieldset( wfMsg( 'centralauth-newgroup-legend' ) );
9898 $html .= wfMsgExt( 'centralauth-newgroup-intro', array( 'parse' ) );
9999 $html .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $wgScript, 'name' => 'centralauth-globalgroups-newgroup' ) );
100 - $html .= Xml::hidden( 'title', SpecialPage::getTitleFor( 'GlobalGroupPermissions' )->getPrefixedText() );
 100+ $html .= Html::hidden( 'title', SpecialPage::getTitleFor( 'GlobalGroupPermissions' )->getPrefixedText() );
101101
102102 $fields = array( 'centralauth-globalgroupperms-newgroupname' => Xml::input( 'wpGroup' ) );
103103
——@@ -119,8 +119,8 @@
120120
121121 if ( $editable ) {
122122 $html .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => SpecialPage::getTitleFor( 'GlobalGroupPermissions', $group )->getLocalUrl(), 'name' => 'centralauth-globalgroups-newgroup' ) );
123 - $html .= Xml::hidden( 'wpGroup', $group );
124 - $html .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 123+ $html .= Html::hidden( 'wpGroup', $group );
 124+ $html .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
125125 }
126126
127127 $fields = array();
Index: trunk/extensions/CentralAuth/CentralAuth.php
——@@ -247,7 +247,6 @@
248248 $wgLogActionsHandlers["gblrights/{$type}"] = 'efHandleWikiSetLogEntry';
249249
250250 function efHandleWikiSetLogEntry( $type, $action, $title, $skin, $params, $filterWikilinks = false ) {
251 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
252251 $link = $skin ? $skin->makeLinkObj( $title, $params[0] ) : $params[0];
253252 if ( $action == 'newset' ) {
254253 $args = array( WikiSet::formatType( $params[1] ), $params[2] );
Index: trunk/extensions/CentralAuth/SpecialCentralAuth.php
——@@ -230,7 +230,7 @@
231231 'action' => $wgScript ) ) .
232232 '<fieldset>' .
233233 Xml::element( 'legend', array(), wfMsg( 'centralauth-admin-manage' ) ) .
234 - Xml::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
 234+ Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) .
235235 '<p>' .
236236 Xml::inputLabel( wfMsg( 'centralauth-admin-username' ),
237237 'target', 'target', 25, $this->mUserName ) .
——@@ -314,8 +314,8 @@
315315 'action' =>
316316 $this->getTitle( $this->mUserName )->getLocalUrl( 'action=submit' ),
317317 'id' => 'mw-centralauth-merged' ) ) .
318 - Xml::hidden( 'wpMethod', 'unmerge' ) .
319 - Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
 318+ Html::hidden( 'wpMethod', 'unmerge' ) .
 319+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
320320 Xml::openElement( 'table', array( 'class' => 'wikitable sortable mw-centralauth-wikislist' ) ) . "\n" .
321321 '<thead><tr>' .
322322 ( $this->mCanUnmerge ? '<th></th>' : '' ) .
——@@ -487,8 +487,8 @@
488488 'method' => 'POST',
489489 'action' => $this->getTitle()->getFullUrl( 'target=' . urlencode( $this->mUserName ) ),
490490 'id' => "mw-centralauth-$action" ) ) .
491 - Xml::hidden( 'wpMethod', $action ) .
492 - Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
 491+ Html::hidden( 'wpMethod', $action ) .
 492+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
493493 wfMsgExt( "centralauth-admin-{$action}-description", 'parse' ) .
494494 Xml::buildForm(
495495 array( 'centralauth-admin-reason' => Xml::input( 'reason',
——@@ -503,8 +503,8 @@
504504 global $wgUser, $wgOut;
505505 $form = '';
506506 $form .= Xml::fieldset( wfMsg( 'centralauth-admin-status' ) );
507 - $form .= Xml::hidden( 'wpMethod', 'set-status' );
508 - $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
 507+ $form .= Html::hidden( 'wpMethod', 'set-status' );
 508+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() );
509509 $form .= wfMsgExt( 'centralauth-admin-status-intro', 'parse' );
510510
511511 // Radio buttons
Index: trunk/extensions/CentralAuth/SpecialMergeAccount.php
——@@ -426,10 +426,10 @@
427427 'method' => 'post',
428428 'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) ) .
429429 Xml::element( 'h2', array(), $title ) .
430 - Xml::hidden( 'wpEditToken', $wgUser->editToken() ) .
431 - Xml::hidden( 'wpMergeAction', $action ) .
432 - Xml::hidden( 'wpMergeSessionToken', $this->mSessionToken ) .
433 - Xml::hidden( 'wpMergeSessionKey', bin2hex( $this->mSessionKey ) ) .
 430+ Html::hidden( 'wpEditToken', $wgUser->editToken() ) .
 431+ Html::hidden( 'wpMergeAction', $action ) .
 432+ Html::hidden( 'wpMergeSessionToken', $this->mSessionToken ) .
 433+ Html::hidden( 'wpMergeSessionKey', bin2hex( $this->mSessionKey ) ) .
434434
435435 $text .
436436
Index: trunk/extensions/CentralAuth/CentralAuthHooks.php
——@@ -92,7 +92,6 @@
9393 static function onAbortNewAccount( $user, &$abortError ) {
9494 $centralUser = CentralAuthUser::getInstance( $user );
9595 if ( $centralUser->exists() ) {
96 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
9796 $abortError = wfMsg( 'centralauth-account-exists' );
9897 return false;
9998 }
——@@ -115,7 +114,6 @@
116115 // On other domains
117116 global $wgCentralAuthAutoLoginWikis;
118117 if ( !$wgCentralAuthAutoLoginWikis ) {
119 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
120118 $inject_html .= wfMsgExt( 'centralauth-login-no-others', 'parsemag' );
121119 return true;
122120 }
——@@ -125,7 +123,6 @@
126124 return true;
127125 }
128126
129 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
130127 $inject_html .= '<div class="centralauth-login-box"><p>' .
131128 wfMsgExt( 'centralauth-login-progress', array( 'parsemag' ), $user->getName() ) . "</p>\n<p>";
132129 foreach ( $wgCentralAuthAutoLoginWikis as $alt => $wiki ) {
——@@ -266,7 +263,6 @@
267264 // Nothing to do.
268265 return true;
269266 } elseif ( !$wgCentralAuthAutoLoginWikis ) {
270 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
271267 $inject_html .= wfMsgExt( 'centralauth-logout-no-others', 'parse' );
272268 return true;
273269 }
——@@ -276,13 +272,11 @@
277273 if ( !$centralUser->exists() || !$centralUser->isAttached() ) {
278274 return true;
279275 } elseif ( !$wgCentralAuthAutoLoginWikis ) {
280 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
281276 $inject_html .= wfMsgExt( 'centralauth-logout-no-others', 'parse' );
282277 return true;
283278 }
284279
285280 // Generate the images
286 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
287281 $inject_html .= '<div class="centralauth-logout-box"><p>' .
288282 wfMsg( 'centralauth-logout-progress' ) . "</p>\n<p>";
289283 $centralUser = new CentralAuthUser( $userName );
——@@ -342,12 +336,10 @@
343337 static function onRenameUserWarning( $oldName, $newName, &$warnings ) {
344338 $oldCentral = new CentralAuthUser( $oldName );
345339 if ( $oldCentral->exists() && $oldCentral->isAttached() ) {
346 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
347340 $warnings[] = array( 'centralauth-renameuser-merged', $oldName, $newName );
348341 }
349342 $newCentral = new CentralAuthUser( $newName );
350343 if ( $newCentral->exists() && !$newCentral->isAttached() ) {
351 - wfLoadExtensionMessages( 'SpecialCentralAuth' );
352344 $warnings[] = array( 'centralauth-renameuser-reserved', $oldName, $newName );
353345 }
354346 return true;
Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php
——@@ -435,7 +435,7 @@
436436
437437 if ( $this->canEdit() ) {
438438 $form .= Xml::submitButton( wfMsg( 'abusefilter-edit-save' ), array( 'accesskey' => 's' ) );
439 - $form .= Xml::hidden(
 439+ $form .= Html::hidden(
440440 'wpEditToken',
441441 $wgUser->editToken( array( 'abusefilter', $filter ) )
442442 );
Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php
——@@ -197,8 +197,6 @@
198198 }
199199
200200 public static function ajaxCheckSyntax( $filter ) {
201 - wfLoadExtensionMessages( 'AbuseFilter' );
202 -
203201 global $wgUser;
204202 if ( !$wgUser->isAllowed( 'abusefilter-modify' ) ) {
205203 return false;
——@@ -323,7 +321,6 @@
324322 }
325323
326324 public static function evaluateExpression( $expr, $vars = array() ) {
327 - wfLoadExtensionMessages( 'AbuseFilter' );
328325 global $wgAbuseFilterParserClass;
329326
330327 if ( self::checkSyntax( $expr ) !== true ) {
——@@ -339,7 +336,6 @@
340337
341338 public static function ajaxReAutoconfirm( $username ) {
342339 global $wgUser;
343 - wfLoadExtensionMessages( 'AbuseFilter' );
344340
345341 if ( !$wgUser->isAllowed( 'abusefilter-modify' ) ) {
346342 // Don't allow it.
——@@ -631,8 +627,6 @@
632628 $actionsByFilter = self::getConsequencesForFilters( $filters );
633629 $actionsTaken = array_fill_keys( $filters, array() );
634630
635 - wfLoadExtensionMessages( 'AbuseFilter' );
636 -
637631 $messages = array();
638632
639633 foreach ( $actionsByFilter as $filter => $actions ) {
Index: trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
——@@ -100,7 +100,6 @@
101101 }
102102
103103 public static function onAbortNewAccount( $user, &$message ) {
104 - wfLoadExtensionMessages( 'AbuseFilter' );
105104 if ( $user->getName() == wfMsgForContent( 'abusefilter-blocker' ) ) {
106105 $message = wfMsg( 'abusefilter-accountreserved' );
107106 return false;
——@@ -221,7 +220,6 @@
222221
223222 public static function onContributionsToolLinks( $id, $nt, &$tools ) {
224223 global $wgUser;
225 - wfLoadExtensionMessages( 'AbuseFilter' );
226224 if ( $wgUser->isAllowed( 'abusefilter-log' ) ) {
227225 $sk = $wgUser->getSkin();
228226 $tools[] = $sk->link(
Index: trunk/extensions/ReaderFeedback/ReaderFeedback.hooks.php
——@@ -115,7 +115,6 @@
116116 # Revision being displayed
117117 $id = $wgOut->getRevisionId();
118118 # Load required messages
119 - wfLoadExtensionMessages( 'ReaderFeedback' );
120119 $reviewTitle = SpecialPage::getTitleFor( 'ReaderFeedback' );
121120 $action = $reviewTitle->getLocalUrl( 'action=submit' );
122121 $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action,
——@@ -149,12 +148,12 @@
150149 'title' => wfMsg('readerfeedback-tt-review').' ['.wfMsg('readerfeedback-ak-review').']' )
151150 );
152151 # Hidden params
153 - $form .= Xml::hidden( 'title', $reviewTitle->getPrefixedText() ) . "\n";
154 - $form .= Xml::hidden( 'target', $title->getPrefixedDBKey() ) . "\n";
155 - $form .= Xml::hidden( 'oldid', $id ) . "\n";
156 - $form .= Xml::hidden( 'validatedParams', ReaderFeedbackPage::validationKey( $id, $wgUser->getId() ) );
157 - $form .= Xml::hidden( 'action', 'submit') . "\n";
158 - $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken() ) . "\n";
 152+ $form .= Html::hidden( 'title', $reviewTitle->getPrefixedText() ) . "\n";
 153+ $form .= Html::hidden( 'target', $title->getPrefixedDBKey() ) . "\n";
 154+ $form .= Html::hidden( 'oldid', $id ) . "\n";
 155+ $form .= Html::hidden( 'validatedParams', ReaderFeedbackPage::validationKey( $id, $wgUser->getId() ) );
 156+ $form .= Html::hidden( 'action', 'submit') . "\n";
 157+ $form .= Html::hidden( 'wpEditToken', $wgUser->editToken() ) . "\n";
159158 # Honeypot input
160159 $form .= Xml::input( 'commentary', 12, '', array('style' => 'display:none;') ) . "\n";
161160 $form .= Xml::closeElement( 'fieldset' );
——@@ -171,7 +170,6 @@
172171 global $wgTitle;
173172 # Add rating tab
174173 if( isset($wgTitle) && ReaderFeedback::isPageRateable($wgTitle) ) {
175 - wfLoadExtensionMessages( 'RatingHistory' );
176174 $nav_urls['ratinghist'] = array(
177175 'text' => wfMsg( 'ratinghistory-link' ),
178176 'href' => $skintemplate->makeSpecialUrl( 'RatingHistory',
Index: trunk/extensions/ReaderFeedback/specialpages/ReaderFeedback_body.php
——@@ -169,8 +169,7 @@
170170 $rhist = SpecialPage::getTitleFor( 'RatingHistory' );
171171 $graphLink = $rhist->getFullUrl( 'target='.$form->page->getPrefixedUrl() );
172172 $talk = $form->page->getTalkPage();
173 -
174 - wfLoadExtensionMessages( 'RatingHistory' );
 173+
175174 $tallyTable = ReaderFeedback::getVoteAggregates( $form->page, 31, $form->dims );
176175
177176 $dbw = wfGetDB( DB_MASTER );
Index: trunk/extensions/CrossNamespaceLinks/CrossNamespaceLinks_body.php
——@@ -111,7 +111,6 @@
112112
113113 $plink = $skin->makeKnownLink( $nt->getPrefixedText(), htmlspecialchars( $text ) );
114114
115 - wfLoadExtensionMessages( 'CrossNamespaceLinks' );
116115 return wfMsgExt( 'crossnamespacelinkstext', array( 'parsemag' ), $plink, $wgLang->formatNum( $result->namespace ), htmlspecialchars( $wgLang->getNsText( $result->value ) ) );
117116 }
118117 }
Index: trunk/extensions/SecurePoll/includes/pages/VotePage.php
——@@ -241,8 +241,8 @@
242242 $wgOut->addWikiText( $this->election->getMessage( 'jump-text' ) );
243243 $wgOut->addHTML(
244244 Xml::openElement( 'form', array( 'action' => $url, 'method' => 'post' ) ) .
245 - Xml::hidden( 'token', SecurePoll_RemoteMWAuth::encodeToken( $wgUser->getToken() ) ) .
246 - Xml::hidden( 'id', $wgUser->getId() ) .
 245+ Html::hidden( 'token', SecurePoll_RemoteMWAuth::encodeToken( $wgUser->getToken() ) ) .
 246+ Html::hidden( 'id', $wgUser->getId() ) .
247247 Xml::submitButton( wfMsg( 'securepoll-jump' ) ) .
248248 '</form>'
249249 );
Index: trunk/extensions/CheckUser/CheckUser.php
——@@ -188,7 +188,6 @@
189189 if ( !$wgSecretKey || $from->name == $to->name ) {
190190 return true;
191191 }
192 - wfLoadExtensionMessages( 'CheckUser' );
193192 $userFrom = User::newFromName( $from->name );
194193 $userTo = User::newFromName( $to->name );
195194 $hash = md5( $userTo->getEmail() . $userTo->getId() . $wgSecretKey );
——@@ -232,7 +231,6 @@
233232 * Saves user data into the cu_changes table
234233 */
235234 function efUpdateAutoCreateData( $user ) {
236 - wfLoadExtensionMessages( 'CheckUser' );
237235 // Get IP
238236 $ip = wfGetIP();
239237 // Get XFF header
——@@ -415,7 +413,6 @@
416414 function efLoadCheckUserLink( $id, $nt, &$links ) {
417415 global $wgUser;
418416 if ( $wgUser->isAllowed( 'checkuser' ) ) {
419 - wfLoadExtensionMessages( 'CheckUser' );
420417 $links[] = $wgUser->getSkin()->makeKnownLinkObj(
421418 SpecialPage::getTitleFor( 'CheckUser' ),
422419 wfMsgHtml( 'checkuser-contribs' ),
Index: trunk/extensions/InputBox/InputBox.classes.php
——@@ -181,7 +181,7 @@
182182
183183 // Hidden fulltext param for IE (bug 17161)
184184 if( $type == 'fulltext' ) {
185 - $htmlOut .= Xml::hidden( 'fulltext', 'Search' );
 185+ $htmlOut .= Html::hidden( 'fulltext', 'Search' );
186186 }
187187
188188 $htmlOut .= Xml::closeElement( 'form' );

Follow-up revisions

RevisionCommit summaryAuthorDate
r77340Fix Xml::Html from r75646/Bug 26114 - When clicking Category Tree at Special ...reedy19:09, 26 November 2010

Comments

#Comment by Bawolff (talk | contribs)   19:01, 26 November 2010

In r1=75645&r2=75646 this converted Xml::hidden to Xml::Html, where I assume it was supposed to convert it to Html::hidden. (Reported in bugzilla:26114)

#Comment by Reedy (talk | contribs)   19:10, 26 November 2010

Cheers for poking the revision :)

Status & tagging log