jenkins-bot has submitted this change and it was merged.
Change subject: on Creating a newsletter via Special:CreateNewsletter save it
correctly
......................................................................
on Creating a newsletter via Special:CreateNewsletter save it correctly
Bug: T150075
Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
---
M includes/specials/SpecialNewsletterCreate.php
1 file changed, 18 insertions(+), 4 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index 84005fa..cd952fe 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -126,9 +126,23 @@
$newsletterCreated = $store->addNewsletter( $this->newsletter );
if ( $newsletterCreated ) {
- $this->onPostCreation( $user );
-
- return Status::newGood();
+ $title = Title::makeTitleSafe( NS_NEWSLETTER, trim(
$data['Name'] ) );
+ $editSummaryMsg = $this->msg(
'newsletter-create-editsummary' );
+ $result = NewsletterContentHandler::edit(
+ $title,
+ $data['Description'],
+ $input['mainpage'],
+ array( $user->getName() ),
+ $editSummaryMsg->inContentLanguage()->plain(),
+ $this->getContext()
+ );
+ if ( $result->isGood() ) {
+ $this->onPostCreation( $user );
+ return Status::newGood();
+ } else {
+ // The content creation was unsuccessful, lets
rollback the newsletter from db
+ $store->rollBackNewsletterAddition(
$this->newsletter );
+ }
}
// Couldn't insert to the DB..
@@ -147,7 +161,7 @@
}
public function onSuccess() {
- $this->getOutput()->addWikiMsg(
'newsletter-create-confirmation', $this->newsletter->getId() );
+ $this->getOutput()->addWikiMsg(
'newsletter-create-confirmation', $this->newsletter->getName() );
}
public function doesWrites() {
--
To view, visit https://gerrit.wikimedia.org/r/320089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <[email protected]>
Gerrit-Reviewer: 01tonythomas <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
