Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248348
Change subject: Use HTMLTitleTextField for mainpage field in
Special:CreateNewsletter
......................................................................
Use HTMLTitleTextField for mainpage field in Special:CreateNewsletter
Change-Id: Id61019fef4565ce2e2df22740e3abc3db1930474
---
M i18n/en.json
M i18n/qqq.json
M includes/specials/SpecialNewsletterCreate.php
3 files changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/48/248348/1
diff --git a/i18n/en.json b/i18n/en.json
index b533160..c95bb9e 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -23,13 +23,12 @@
"newsletter-unconfirmed-email-error": "The provided username does not
have a confirmed email address!",
"newsletter-required-fields-error": "Required fields are empty",
"newsletter-exist-error": "A newsletter with the same name already
exists. Try again with another name",
- "newsletter-mainpage-not-found-error": "Newsletter main page does not
exist. Please try again.",
"newsletter-announceissueform-announceissue-section": "Announce new
issue",
"newsletter-addpublisherform-addpublisher-section": "Add publishers",
"newsletter-create-section": "Create newsletter",
"newsletter-create-submit": "Create newsletter",
"newsletter-create-confirmation": "A new newsletter has been
successfully created. You can manage newsletters through
[[Special:ManageNewsletter]].",
- "newsletter-create-mainpage-error": "Invalid characters Newsletter main
page entered. Please try again",
+ "newsletter-create-mainpage-error": "Invalid Newsletter main page
entered. Please try again.",
"newsletter-issue-announce-confirmation": "Good job! You just announced
a new issue of your newsletter.",
"newsletter-subtitlelinks-list": "List of newsletters",
"newsletter-subtitlelinks-create": "Create a new newsletter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 26d4a8e..76f8b98 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -27,7 +27,6 @@
"newsletter-unconfirmed-email-error": "Error message to be displayed in
[[Special:NewsletterManage]] when the username of the publisher to be added
does not have a confirmed email address",
"newsletter-required-fields-error": "Error message to be displayed when
required fields are empty in [[Special:NewsletterManage]]",
"newsletter-exist-error": "Error message to be displayed in
[[Special:NewsletterCreate]] when trying to create a newsletter with same name
as an existing newsletter",
- "newsletter-mainpage-not-found-error": "Error message to be displayed
in [[Special:NewsletterCreate]] when trying to create a newsletter with invalid
main page",
"newsletter-announceissueform-announceissue-section": "Header of
section in [[Special:NewsletterManage]] which announces issues",
"newsletter-addpublisherform-addpublisher-section": "Header of section
in [[Special:NewsletterManage]] which adds publishers",
"newsletter-create-section": "Section header of
[[Special:NewsletterCreate]]",
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index e1dc43d..26345b0 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -47,8 +47,9 @@
'maxlength' => 767
),
'mainpage' => array(
+ 'type' => 'title',
+ 'exists' => true,
'required' => true,
- 'type' => 'text',
'label-message' => 'newsletter-title',
),
'frequency' => array(
@@ -76,13 +77,12 @@
$mainTitle = Title::newFromText( $data['mainpage'] );
if ( !$mainTitle ) {
- return array( 'newsletter-create-mainpage-invalid' );
+ // HTMLTitleTextField should do validation but we can't
be sure about
+ // so let's check again here - otherwise this may throw
fatals below
+ return array( 'newsletter-create-mainpage-error' );
}
$articleId = $mainTitle->getArticleId();
- if ( !$articleId ) {
- return array( 'newsletter-mainpage-not-found-error' );
- }
if ( isset( $data['name'] ) &&
isset( $data['description'] ) &&
--
To view, visit https://gerrit.wikimedia.org/r/248348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id61019fef4565ce2e2df22740e3abc3db1930474
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
