http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97900
Revision: 97900
Author: raymond
Date: 2011-09-23 10:08:15 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Modernize this part: Call Linker methods statically
* wfMsg() -> wfMessage()
* no functional changes. This follows with the next commit
Modified Paths:
--------------
trunk/extensions/Renameuser/Renameuser_body.php
Modified: trunk/extensions/Renameuser/Renameuser_body.php
===================================================================
--- trunk/extensions/Renameuser/Renameuser_body.php 2011-09-23 08:44:36 UTC
(rev 97899)
+++ trunk/extensions/Renameuser/Renameuser_body.php 2011-09-23 10:08:15 UTC
(rev 97900)
@@ -285,31 +285,49 @@
}
$output = '';
- $skin = $wgUser->getSkin();
foreach ( $pages as $row ) {
$oldPage = Title::makeTitleSafe(
$row->page_namespace, $row->page_title );
$newPage = Title::makeTitleSafe(
$row->page_namespace,
preg_replace( '!^[^/]+!',
$newusername->getDBkey(), $row->page_title ) );
# Do not autodelete or anything, title must not
exist
if ( $newPage->exists() &&
!$oldPage->isValidMoveTarget( $newPage ) ) {
- $link = $skin->makeKnownLinkObj(
$newPage );
- $output .= '<li
class="mw-renameuser-pe">' . wfMsgHtml( 'renameuser-page-exists', $link ) .
'</li>';
+ $link = Linker::linkKnown( $newPage );
+ $output .= Html::rawElement(
+ 'li',
+ array( 'class'
=> 'mw-renameuser-pe' ),
+ wfMessage(
'renameuser-page-exists' )->rawParams( $link )->escaped()
+ );
} else {
- $success = $oldPage->moveTo( $newPage,
false, wfMsgForContent( 'renameuser-move-log',
- $oldusername->getText(),
$newusername->getText() ), !$suppressRedirect );
+ $success = $oldPage->moveTo(
+ $newPage,
+ false,
+ wfMessage(
+
'renameuser-move-log',
+
$oldusername->getText(),
+
$newusername->getText() )->inContentLanguage()->text(),
+
!$suppressRedirect
+ );
if ( $success === true ) {
- $oldLink =
$skin->makeKnownLinkObj( $oldPage, '', 'redirect=no' );
- $newLink =
$skin->makeKnownLinkObj( $newPage );
- $output .= '<li
class="mw-renameuser-pm">' . wfMsgHtml( 'renameuser-page-moved', $oldLink,
$newLink ) . '</li>';
+ $oldLink = Linker::linkKnown(
$oldPage, null, array(), array( 'redirect' => 'no' ) );
+ $newLink = Linker::linkKnown(
$newPage );
+ $output .= Html::rawElement(
+ 'li',
+ array(
'class' => 'mw-renameuser-pm' ),
+
wfMessage( 'renameuser-page-moved' )->rawParams( $oldLink, $newLink )->escaped()
+ );
} else {
- $oldLink =
$skin->makeKnownLinkObj( $oldPage );
- $newLink = $skin->makeLinkObj(
$newPage );
- $output .= '<li
class="mw-renameuser-pu">' . wfMsgHtml( 'renameuser-page-unmoved', $oldLink,
$newLink ) . '</li>';
+ $oldLink = Linker::linkKnown(
$oldPage );
+ $newLink = Linker::link(
$newPage );
+ $output .= Html::rawElement(
+ 'li',
array( 'class' => 'mw-renameuser-pu' ),
+
wfMessage( 'renameuser-page-unmoved' )->rawParams( $oldLink, $newLink
)->escaped()
+ );
}
}
}
- if ( $output )
- $wgOut->addHTML( '<ul>' . $output . '</ul>' );
+ if ( $output ) {
+ $wgOut->addHTML( Html::rawElement( 'ul',
array(), $output ) );
+ }
}
// Output success message stuff :)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
