Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176980
Change subject: Use call_user_func for callables
......................................................................
Use call_user_func for callables
Can't use $cb( ... ) if $cb is an array
Bug: T76310
Change-Id: I95edc018b2d0d011455c7a20146d3c8adb2b9b0a
---
M MergeUser.php
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/80/176980/1
diff --git a/MergeUser.php b/MergeUser.php
index 5385289..dc8b879 100644
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -363,6 +363,10 @@
)
);
+ $message = function( /* ... */ ) use ( $msg ) {
+ return call_user_func_array( $msg, func_get_args() );
+ };
+
// Need to set $wgUser to attribute log properly.
$oldUser = $wgUser;
$wgUser = $performer;
@@ -377,27 +381,27 @@
if ( $this->newUser->getName() === "Anonymous" ) { #
delete ALL old pages
if ( $oldPage->exists() ) {
$oldPageArticle = new Article(
$oldPage, 0 );
- $oldPageArticle->doDeleteArticle( $msg(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
}
} elseif ( $newPage->exists()
&& !$oldPage->isValidMoveTarget( $newPage )
&& $newPage->getLength() > 0 ) { # delete old
pages that can't be moved
$oldPageArticle = new Article( $oldPage, 0 );
- $oldPageArticle->doDeleteArticle( $msg(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle( $message(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
} else { # move content to new page
# delete target page if it exists and is blank
if ( $newPage->exists() ) {
$newPageArticle = new Article(
$newPage, 0 );
- $newPageArticle->doDeleteArticle( $msg(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $newPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
}
# move to target location
$errors = $oldPage->moveTo(
$newPage,
false,
- $msg(
+ $message(
'usermerge-move-log',
$oldusername->getText(),
$newusername->getText()
)->inContentLanguage()->text()
@@ -415,7 +419,7 @@
if ( !$dbr->numRows( $res ) ) {
# nothing links here, so delete unmoved
page/redirect
$oldPageArticle = new Article(
$oldPage, 0 );
- $oldPageArticle->doDeleteArticle( $msg(
'usermerge-autopagedelete' )->inContentLanguage()->text() );
+ $oldPageArticle->doDeleteArticle(
$message( 'usermerge-autopagedelete' )->inContentLanguage()->text() );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/176980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95edc018b2d0d011455c7a20146d3c8adb2b9b0a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
