jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368943 )
Change subject: Check canHaveTalkPage() before calling getTalkPage()
......................................................................
Check canHaveTalkPage() before calling getTalkPage()
Bug: T172146
Change-Id: I13e9d040e215b04de7843767706f6799a7787524
---
M includes/api/ApiEchoUnreadNotificationPages.php
M includes/formatters/RevertedPresentationModel.php
2 files changed, 13 insertions(+), 5 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiEchoUnreadNotificationPages.php
b/includes/api/ApiEchoUnreadNotificationPages.php
index 3d12209..53c1f76 100644
--- a/includes/api/ApiEchoUnreadNotificationPages.php
+++ b/includes/api/ApiEchoUnreadNotificationPages.php
@@ -126,7 +126,10 @@
foreach ( $groupCounts as $pageName => $count ) {
if ( $groupPages ) {
$title = Title::newFromText( $pageName );
- $pages = [
$title->getSubjectPage()->getPrefixedText(),
$title->getTalkPage()->getPrefixedText() ];
+ $pages = [
$title->getSubjectPage()->getPrefixedText() ];
+ if ( $title->canHaveTalkPage() ) {
+ $pages[] =
$title->getTalkPage()->getPrefixedText();
+ }
if ( $pageName === $userPageName ) {
$pages[] = null;
}
diff --git a/includes/formatters/RevertedPresentationModel.php
b/includes/formatters/RevertedPresentationModel.php
index 85a79cf..04d63b9 100644
--- a/includes/formatters/RevertedPresentationModel.php
+++ b/includes/formatters/RevertedPresentationModel.php
@@ -44,11 +44,16 @@
}
public function getSecondaryLinks() {
- $revertedTitleLink = $this->getPageLink(
- $this->event->getTitle()->getTalkPage(), null, true
- );
+ $links = [ $this->getAgentLink() ];
- return [ $this->getAgentLink(), $revertedTitleLink ];
+ $title = $this->event->getTitle();
+ if ( $title->canHaveTalkPage() ) {
+ $links[] = $this->getPageLink(
+ $title->getTalkPage(), null, true
+ );
+ }
+
+ return $links;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/368943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13e9d040e215b04de7843767706f6799a7787524
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
