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 83
......................................................................
Fix Call to a member function getPrefixedText() on a non-object in
ThreadPermalinkView.php on line 83
Bug: 54254
Change-Id: I49e9720e2ab6397e8f5e7aa50b35c4622e13f6a9
---
M pages/ThreadPermalinkView.php
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pages/ThreadPermalinkView.php b/pages/ThreadPermalinkView.php
index 93e7fca..da53068 100644
--- a/pages/ThreadPermalinkView.php
+++ b/pages/ThreadPermalinkView.php
@@ -63,7 +63,7 @@
$links['actions'] = array();
unset( $links['namespaces'][$talkKey] );
- return true;
+ return;
}
// Insert 'article' and 'discussion' namespace-tabs
@@ -79,17 +79,18 @@
unset( $views['viewsource'] );
unset( $views['edit'] );
+ $subpageTitle = $view->thread->title();
// Re-point move, delete and history actions
- $subpage = $view->thread->title()->getPrefixedText();
$actions =& $links['actions'];
- if ( isset( $actions['move'] ) ) {
+ if ( isset( $actions['move'] ) && $subpageTitle ) {
+ $subpage = $subpageTitle->getPrefixedText();
$actions['move']['href'] =
- SpecialPage::getTitleFor( 'MoveThread', $subpage
)->getLocalURL();
+ SpecialPage::getTitleFor( 'MoveThread',
$subpage )->getLocalURL();
}
- if ( isset( $actions['delete'] ) ) {
+ if ( isset( $actions['delete'] ) && $subpageTitle ) {
$actions['delete']['href'] =
- $view->thread->title()->getLocalURL(
'action=delete' );
+ $subpageTitle->getLocalURL( 'action=delete' );
}
if ( isset( $views['history'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/84703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49e9720e2ab6397e8f5e7aa50b35c4622e13f6a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: 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
