dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backfill release notes for Iaf531795
[lhc/web/wiklou.git]
/
maintenance
/
cleanupSpam.php
diff --git
a/maintenance/cleanupSpam.php
b/maintenance/cleanupSpam.php
index
4e47cfb
..
038b28c
100644
(file)
--- a/
maintenance/cleanupSpam.php
+++ b/
maintenance/cleanupSpam.php
@@
-47,16
+47,15
@@
class CleanupSpam extends Maintenance {
$username = wfMessage( 'spambot_username' )->text();
$wgUser = User::newSystemUser( $username );
if ( !$wgUser ) {
$username = wfMessage( 'spambot_username' )->text();
$wgUser = User::newSystemUser( $username );
if ( !$wgUser ) {
- $this->error( "Invalid username specified in 'spambot_username' message: $username", true );
- }
- // Create the user if necessary
- if ( !$wgUser->getId() ) {
- $wgUser->addToDatabase();
+ $this->fatalError( "Invalid username specified in 'spambot_username' message: $username" );
}
}
+ // Hack: Grant bot rights so we don't flood RecentChanges
+ $wgUser->addGroup( 'bot' );
+
$spec = $this->getArg();
$like = LinkFilter::makeLikeArray( $spec );
if ( !$like ) {
$spec = $this->getArg();
$like = LinkFilter::makeLikeArray( $spec );
if ( !$like ) {
- $this->
error( "Not a valid hostname specification: $spec", true
);
+ $this->
fatalError( "Not a valid hostname specification: $spec"
);
}
if ( $this->hasOption( 'all' ) ) {
}
if ( $this->hasOption( 'all' ) ) {
@@
-131,7
+130,7
@@
class CleanupSpam extends Maintenance {
$page->doEditContent(
$content,
wfMessage( 'spam_reverting', $domain )->inContentLanguage()->text(),
$page->doEditContent(
$content,
wfMessage( 'spam_reverting', $domain )->inContentLanguage()->text(),
- EDIT_UPDATE,
+ EDIT_UPDATE
| EDIT_FORCE_BOT
,
$rev->getId()
);
} elseif ( $this->hasOption( 'delete' ) ) {
$rev->getId()
);
} elseif ( $this->hasOption( 'delete' ) ) {
@@
-148,7
+147,8
@@
class CleanupSpam extends Maintenance {
$this->output( "blanking\n" );
$page->doEditContent(
$content,
$this->output( "blanking\n" );
$page->doEditContent(
$content,
- wfMessage( 'spam_blanking', $domain )->inContentLanguage()->text()
+ wfMessage( 'spam_blanking', $domain )->inContentLanguage()->text(),
+ EDIT_UPDATE | EDIT_FORCE_BOT
);
}
$this->commitTransaction( $dbw, __METHOD__ );
);
}
$this->commitTransaction( $dbw, __METHOD__ );
@@
-156,5
+156,5
@@
class CleanupSpam extends Maintenance {
}
}
}
}
-$maintClass =
"CleanupSpam"
;
+$maintClass =
CleanupSpam::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;