jenkins-bot has submitted this change and it was merged.
Change subject: PrefixSearch: avoid looking for titles that don't exist
......................................................................
PrefixSearch: avoid looking for titles that don't exist
WikiPage::getRedirectTarget() can very easily return null. Don't
blow up when that happens.
Properly document PrefixSearch::getRedirectTarget() while we're
here.
Bug: T116029
Change-Id: Ib509e8e3e6ec04a787de3857a4b5ee9b01560559
---
M includes/PrefixSearch.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 430b4b8..f36635b 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -258,12 +258,18 @@
return $array;
}
+ /**
+ * Get a redirect's destination from a title
+ * @param Title $title A title to redirect. It may not redirect or even
exist
+ * @return null|string If title exists and redirects, get the
destination's prefixed name
+ */
private function getRedirectTarget( $title ) {
$page = WikiPage::factory( $title );
if ( !$page->exists() ) {
return null;
}
- return $page->getRedirectTarget()->getPrefixedText();
+ $redir = $page->getRedirectTarget();
+ return $redir ? $redir->getPrefixedText() : null;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/248935
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib509e8e3e6ec04a787de3857a4b5ee9b01560559
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
