jenkins-bot has submitted this change and it was merged.
Change subject: Adjust for new Block constructor
......................................................................
Adjust for new Block constructor
See I6ccd4df5
Change-Id: Ib0b955c173027e31408d79bf4141e020e5e63bca
---
M BanPests.php
1 file changed, 15 insertions(+), 6 deletions(-)
Approvals:
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BanPests.php b/BanPests.php
index 92c15b6..f8a3cdb 100644
--- a/BanPests.php
+++ b/BanPests.php
@@ -104,9 +104,13 @@
$ret = array();
foreach( (array)$ips as $ip ) {
if( !Block::newFromTarget( $ip ) ) {
- $blk = new Block( $ip, null,
- $banningUser->getID(),
wfMsg('blockandnuke-message'),
- wfTimestamp(), 0, wfGetDB( DB_SLAVE
)->getInfinity(), 0, 1, 0, 0, 1);
+ $blk = new Block( array(
+ 'address' => $ip,
+ 'by' =>
$banningUser->getID(),
+ 'reason' => wfMsg(
'blockandnuke-message' ),
+ 'expiry' => wfGetDB( DB_SLAVE
)->getInfinity(),
+ 'createAccount' => true,
+ 'blockEmail' => true ) );
$blk->isAutoBlocking( true );
if( $blk->insert() ) {
$log = new LogPage('block');
@@ -131,9 +135,14 @@
$ret = $um->merge( $user, $spammer, "block",
$banningUser );
} else {
if( !Block::newFromTarget( $user->getName() ) ) {
- $blk = new Block($user->getName(),
$user->getId(),
- $banningUser->getID(),
wfMsg('blockandnuke-message'),
- wfTimestamp(), 0, wfGetDB( DB_SLAVE
)->getInfinity(), 0, 1, 0, 0, 1);
+ $blk = new Block( array(
+ 'address' => $user->getName(),
+ 'user' => $user->getID(),
+ 'by' =>
$banningUser->getID(),
+ 'reason' => wfMsg(
'blockandnuke-message' ),
+ 'expiry' => wfGetDB( DB_SLAVE
)->getInfinity(),
+ 'createAccount' => true,
+ 'blockEmail' => true ) );
$blk->isAutoBlocking( true );
if($ret = $blk->insert()) {
$log = new LogPage('block');
--
To view, visit https://gerrit.wikimedia.org/r/190020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0b955c173027e31408d79bf4141e020e5e63bca
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BlockAndNuke
Gerrit-Branch: master
Gerrit-Owner: Matěj Grabovský <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: MarkAHershberger <[email protected]>
Gerrit-Reviewer: Matěj Grabovský <[email protected]>
Gerrit-Reviewer: Qgil <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
