[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Allow newsletters to have non-mainspace main pages

2017-12-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400589 )

Change subject: Allow newsletters to have non-mainspace main pages
..


Allow newsletters to have non-mainspace main pages

Bug: T183752
Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
---
M includes/NewsletterEditPage.php
M includes/content/NewsletterDataUpdate.php
M includes/content/NewsletterDiffEngine.php
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 88480a7..32f63d9 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -441,7 +441,7 @@
$editResult = NewsletterContentHandler::edit(
$title,
$description,
-   $mainPage->getText(),
+   $mainPage->getFullText(),
$publisherNames,
trim( $data['Summary'] ),
$this->context
diff --git a/includes/content/NewsletterDataUpdate.php 
b/includes/content/NewsletterDataUpdate.php
index 876854a..b22dd72 100644
--- a/includes/content/NewsletterDataUpdate.php
+++ b/includes/content/NewsletterDataUpdate.php
@@ -80,7 +80,7 @@
$newsletter = Newsletter::newFromName( $this->title->getText() 
);
 
$formData = [
-   'Name' => $this->title->getText(),
+   'Name' => $this->title->getFullText(),
'Description' => $this->content->getDescription(),
'MainPage' => $this->content->getMainPage()
];
diff --git a/includes/content/NewsletterDiffEngine.php 
b/includes/content/NewsletterDiffEngine.php
index c3f54bc..5e10f94 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -27,7 +27,7 @@
}
 
$mainPageDiff = $this->generateTextDiffBody(
-   $old->getMainPage()->getText(), 
$new->getMainPage()->getText()
+   $old->getMainPage()->getFullText(), 
$new->getMainPage()->getFullText()
);
 
if ( $mainPageDiff ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/400589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Pppery 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Allow newsletters to have non-mainspace main pages

2017-12-28 Thread Pppery (Code Review) 
Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/400589 )

Change subject: Allow newsletters to have non-mainspace main pages
..

Allow newsletters to have non-mainspace main pages

Bug: T183752
Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
---
M includes/NewsletterEditPage.php
M includes/content/NewsletterDataUpdate.php
M includes/content/NewsletterDiffEngine.php
3 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/89/400589/1

diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 4c0a14f..5d5f5b9 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -445,7 +445,7 @@
$editResult = NewsletterContentHandler::edit(
$title,
$description,
-   $mainPage->getText(),
+   $mainPage->getFullText(),
$publisherNames,
trim( $data['Summary'] ),
$this->context
diff --git a/includes/content/NewsletterDataUpdate.php 
b/includes/content/NewsletterDataUpdate.php
index 76a61ee..d129b21 100644
--- a/includes/content/NewsletterDataUpdate.php
+++ b/includes/content/NewsletterDataUpdate.php
@@ -82,7 +82,7 @@
$newsletter = Newsletter::newFromName( $this->title->getText() 
);
 
$formData = [
-   'Name' => $this->title->getText(),
+   'Name' => $this->title->getFullText(),
'Description' => $this->content->getDescription(),
'MainPage' => $this->content->getMainPage()
];
diff --git a/includes/content/NewsletterDiffEngine.php 
b/includes/content/NewsletterDiffEngine.php
index c3f54bc..5e10f94 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -27,7 +27,7 @@
}
 
$mainPageDiff = $this->generateTextDiffBody(
-   $old->getMainPage()->getText(), 
$new->getMainPage()->getText()
+   $old->getMainPage()->getFullText(), 
$new->getMainPage()->getFullText()
);
 
if ( $mainPageDiff ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/400589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie676dc56e18b24713735575f5b9eae21cc3239a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits