Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275150
Change subject: Only check if the title is an interwiki if it is for the local
site (mm-ch)
......................................................................
Only check if the title is an interwiki if it is for the local site (mm-ch)
Basically the same as c03a32de522422e, but for MassMessageListContent.
Bug: T128939
Change-Id: Id9bee3e3e352b6cbe51404109058c344d4213690
---
M includes/content/MassMessageListContentHandler.php
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/50/275150/1
diff --git a/includes/content/MassMessageListContentHandler.php
b/includes/content/MassMessageListContentHandler.php
index c2eadd2..6a3b703 100644
--- a/includes/content/MassMessageListContentHandler.php
+++ b/includes/content/MassMessageListContentHandler.php
@@ -152,23 +152,22 @@
if ( !$title
|| $title->getText() === ''
|| !$title->canExist()
- || $title->isExternal()
) {
- $result['errors'] = array( 'invalidtitle' );
+ $result['errors'][] = 'invalidtitle';
} else {
$result['title'] = $title->getPrefixedText(); // Use
the canonical form.
}
if ( $site !== null && $site !== MassMessage::getBaseUrl(
$wgCanonicalServer ) ) {
if ( !$wgAllowGlobalMessaging ||
MassMessage::getDBName( $site ) === null ) {
- if ( array_key_exists( 'errors', $result ) ) {
- $result['errors'][] = 'invalidsite';
- } else {
- $result['errors'] = array(
'invalidsite' );
- }
+ $result['errors'][] = 'invalidsite';
} else {
$result['site'] = $site;
}
+ } elseif ( $title && $title->isExternal() ) {
+ // Target has site set to current wiki, but external
title
+ // TODO: Provide better error message?
+ $result['errors'][] = 'invalidtitle';
}
return $result;
--
To view, visit https://gerrit.wikimedia.org/r/275150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9bee3e3e352b6cbe51404109058c344d4213690
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
