jenkins-bot has submitted this change and it was merged.
Change subject: Rename LinksGenerator to NewsletterLinksGenerator
......................................................................
Rename LinksGenerator to NewsletterLinksGenerator
We might run into conflicts with this so do this and be safe.
Change-Id: I2e7a54253e5a6818baab3edbb1d28d30e5afd0de
---
M extension.json
R includes/specials/NewsletterLinksGenerator.php
M includes/specials/SpecialNewsletter.php
M includes/specials/SpecialNewsletterCreate.php
M includes/specials/SpecialNewsletterManage.php
M includes/specials/SpecialNewsletters.php
6 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index d1c7755..4f81e65 100644
--- a/extension.json
+++ b/extension.json
@@ -39,7 +39,7 @@
"Newsletter": "includes/Newsletter.php",
"NewsletterDb": "includes/NewsletterDb.php",
"NewsletterHooks": "Newsletter.hooks.php",
- "LinksGenerator": "includes/specials/LinksGenerator.php",
+ "NewsletterLinksGenerator":
"includes/specials/NewsletterLinksGenerator.php",
"SpecialNewsletter": "includes/specials/SpecialNewsletter.php",
"SpecialNewsletters":
"includes/specials/SpecialNewsletters.php",
"SpecialNewsletterCreate":
"includes/specials/SpecialNewsletterCreate.php",
diff --git a/includes/specials/LinksGenerator.php
b/includes/specials/NewsletterLinksGenerator.php
similarity index 95%
rename from includes/specials/LinksGenerator.php
rename to includes/specials/NewsletterLinksGenerator.php
index de9d499..c4b7bb2 100644
--- a/includes/specials/LinksGenerator.php
+++ b/includes/specials/NewsletterLinksGenerator.php
@@ -4,7 +4,7 @@
* @license GNU GPL v2+
* @author Glaisher
*/
-class LinksGenerator {
+class NewsletterLinksGenerator {
/**
* Get links to newsletter special pages shown in the subtitle
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 8e33068..e15d399 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -65,7 +65,7 @@
// Just show an error message if we couldn't find a
newsletter
$out->showErrorPage( 'newsletter-notfound',
'newsletter-not-found-id' );
}
- $out->setSubtitle( LinksGenerator::getSubtitleLinks() );
+ $out->setSubtitle( NewsletterLinksGenerator::getSubtitleLinks()
);
}
/**
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index 7925ccc..ff8261e 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -16,7 +16,7 @@
public function execute( $par ) {
$this->requireLogin();
parent::execute( $par );
- $this->getOutput()->setSubtitle(
LinksGenerator::getSubtitleLinks() );
+ $this->getOutput()->setSubtitle(
NewsletterLinksGenerator::getSubtitleLinks() );
}
/**
diff --git a/includes/specials/SpecialNewsletterManage.php
b/includes/specials/SpecialNewsletterManage.php
index d1195e7..22fedca 100644
--- a/includes/specials/SpecialNewsletterManage.php
+++ b/includes/specials/SpecialNewsletterManage.php
@@ -17,7 +17,7 @@
$this->setHeaders();
$output = $this->getOutput();
$output->addModules( 'ext.newslettermanage' );
- $output->setSubtitle( LinksGenerator::getSubtitleLinks() );
+ $output->setSubtitle(
NewsletterLinksGenerator::getSubtitleLinks() );
$this->requireLogin();
# Create HTML forms
diff --git a/includes/specials/SpecialNewsletters.php
b/includes/specials/SpecialNewsletters.php
index 4743f0d..e18868a 100644
--- a/includes/specials/SpecialNewsletters.php
+++ b/includes/specials/SpecialNewsletters.php
@@ -22,7 +22,7 @@
$out->addModuleStyles( 'ext.newsletter.styles' );
$out->addModules( 'ext.newsletter' );
}
- $out->setSubtitle( LinksGenerator::getSubtitleLinks() );
+ $out->setSubtitle( NewsletterLinksGenerator::getSubtitleLinks()
);
$pager = new NewsletterTablePager();
if ( $pager->getNumRows() > 0 ) {
--
To view, visit https://gerrit.wikimedia.org/r/249992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e7a54253e5a6818baab3edbb1d28d30e5afd0de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[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
