jenkins-bot has submitted this change and it was merged.
Change subject: Fix Call to a member function getPrefixedText() on a non-object
in ThreadPermalinkView.php on line 207
......................................................................
Fix Call to a member function getPrefixedText() on a non-object in
ThreadPermalinkView.php on line 207
Bug: 41056
Change-Id: Id92a9763a0fa8001debe80b046be539af6f68091
---
M pages/ThreadPermalinkView.php
1 file changed, 16 insertions(+), 13 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pages/ThreadPermalinkView.php b/pages/ThreadPermalinkView.php
index 93e7fca..c9a26d4 100644
--- a/pages/ThreadPermalinkView.php
+++ b/pages/ThreadPermalinkView.php
@@ -209,19 +209,22 @@
$this->request->setVal( 'lqt_operand',
$this->thread->id() );
}
- // Expose feed links.
- global $wgFeedClasses;
- $thread =
$this->thread->topmostThread()->title()->getPrefixedText();
- $apiParams = array(
- 'action' => 'feedthreads',
- 'type' => 'replies|newthreads',
- 'thread' => $thread
- );
- $urlPrefix = wfScript( 'api' ) . '?';
- foreach ( $wgFeedClasses as $format => $class ) {
- $theseParams = $apiParams + array( 'feedformat' =>
$format );
- $url = $urlPrefix . wfArrayToCgi( $theseParams );
- $this->output->addFeedLink( $format, $url );
+ $topmostThreadTitle = $this->thread->topmostThread()->title();
+ if ( $topmostThreadTitle ) {
+ // Expose feed links.
+ global $wgFeedClasses;
+ $thread = $topmostThreadTitle->getPrefixedText();
+ $apiParams = array(
+ 'action' => 'feedthreads',
+ 'type' => 'replies|newthreads',
+ 'thread' => $thread
+ );
+ $urlPrefix = wfScript( 'api' ) . '?';
+ foreach ( $wgFeedClasses as $format => $class ) {
+ $theseParams = $apiParams + array( 'feedformat'
=> $format );
+ $url = $urlPrefix . wfArrayToCgi( $theseParams
);
+ $this->output->addFeedLink( $format, $url );
+ }
}
$this->output->setSubtitle( $this->getSubtitle() );
--
To view, visit https://gerrit.wikimedia.org/r/84704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id92a9763a0fa8001debe80b046be539af6f68091
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
