jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374620 )
Change subject: Title: Make getOtherPage() check canHaveTalkPage()
......................................................................
Title: Make getOtherPage() check canHaveTalkPage()
Practically this doesn't make any difference, but once it's possible for
namespaces to not have talk pages, this function would have returned an
invalid Title.
Bug: T165149
Change-Id: I940433c22193d406d8b4a6cab0e6ad37e88e62c6
---
M includes/Title.php
M tests/phpunit/includes/TitleMethodsTest.php
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Title.php b/includes/Title.php
index b6a1689..6535890 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1355,7 +1355,7 @@
* get the talk page, if it is a subject page get the talk page
*
* @since 1.25
- * @throws MWException
+ * @throws MWException If the page doesn't have an other page
* @return Title
*/
public function getOtherPage() {
@@ -1365,6 +1365,9 @@
if ( $this->isTalkPage() ) {
return $this->getSubjectPage();
} else {
+ if ( !$this->canHaveTalkPage() ) {
+ throw new MWException(
"{$this->getPrefixedText()} does not have an other page" );
+ }
return $this->getTalkPage();
}
}
diff --git a/tests/phpunit/includes/TitleMethodsTest.php
b/tests/phpunit/includes/TitleMethodsTest.php
index 8af3434..d9c01cb 100644
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -305,6 +305,7 @@
[ 'Help:Main Page', 'Help talk:Main Page' ],
[ 'Help talk:Main Page', 'Help:Main Page' ],
[ 'Special:FooBar', null ],
+ [ 'Media:File.jpg', null ],
];
}
--
To view, visit https://gerrit.wikimedia.org/r/374620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I940433c22193d406d8b4a6cab0e6ad37e88e62c6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
