jenkins-bot has submitted this change and it was merged.
Change subject: Throw an error on non-TextContent spamlists
......................................................................
Throw an error on non-TextContent spamlists
Change-Id: I0aa8d6ccf5c44e208a7ffc0296b8d4aa838db814
---
M MassMessage.body.php
M SpecialMassMessage.php
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MassMessage.body.php b/MassMessage.body.php
index 96a8a42..c9be8e0 100644
--- a/MassMessage.body.php
+++ b/MassMessage.body.php
@@ -179,10 +179,7 @@
if ( $content instanceof TextContent ) {
$text = $content->getNativeData();
} else {
- // Spamlist input isn't a text page
- // @fixme
- // $this->status->fatal(
'massmessage-spamlist-doesnotexist' );
- return array();
+ return 'massmessage-spamlist-doesnotexist';
}
// Prep the parser
diff --git a/SpecialMassMessage.php b/SpecialMassMessage.php
index cb34c1c..fc83d4c 100644
--- a/SpecialMassMessage.php
+++ b/SpecialMassMessage.php
@@ -267,6 +267,10 @@
// Insert it into the job queue.
$pages = MassMessage::getParserFunctionTargets( $spamlist,
$this->getContext() );
+ if ( !is_array( $pages ) ) {
+ $this->status->fatal( $pages );
+ return $this->status;
+ }
$pages = MassMessage::normalizeSpamList( $pages );
foreach ( $pages as $page ) {
$title = Title::newFromText( $page['title'] );
--
To view, visit https://gerrit.wikimedia.org/r/79320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0aa8d6ccf5c44e208a7ffc0296b8d4aa838db814
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
