Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312949
Change subject: Cleanup: Use helper functions
......................................................................
Cleanup: Use helper functions
Change-Id: Ie54b91fecb2b764a620fc673e72fd81477044466
---
M includes/Banner.php
M special/SpecialCentralNoticeBanners.php
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/49/312949/1
diff --git a/includes/Banner.php b/includes/Banner.php
index e91dc10..5cf1159 100644
--- a/includes/Banner.php
+++ b/includes/Banner.php
@@ -931,6 +931,7 @@
try {
// Don't move this to saveBannerInternal--can't be in a
transaction
+ // TODO: explain why not. Is text in another database?
$this->saveBodyContent( $summary );
// Open a transaction so that everything is consistent
@@ -1083,9 +1084,7 @@
);
// Delete the MediaWiki page that contains the banner
source
- $article = new Article(
- Title::newFromText(
"centralnotice-template-{$name}", NS_MEDIAWIKI )
- );
+ $article = new Article( $bannerObj->getTitle() );
$pageId = $article->getPage()->getId();
// TODO Inconsistency: deletion of banner content is
not recorded
diff --git a/special/SpecialCentralNoticeBanners.php
b/special/SpecialCentralNoticeBanners.php
index f8359a9..cf18795 100755
--- a/special/SpecialCentralNoticeBanners.php
+++ b/special/SpecialCentralNoticeBanners.php
@@ -377,7 +377,8 @@
)
);
- $bannerTitle = Title::newFromText(
"Centralnotice-template-{$this->bannerName}", NS_MEDIAWIKI );
+ $bannerObj = Banner::fromName( $this->bannerName );
+ $bannerTitle = $bannerObj->getTitle();
// $bannerTitle can be null sometimes
if ( $bannerTitle && $this->getUser()->isAllowed(
'editinterface' ) ) {
$links[] = Linker::link(
--
To view, visit https://gerrit.wikimedia.org/r/312949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie54b91fecb2b764a620fc673e72fd81477044466
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
