jenkins-bot has submitted this change and it was merged.
Change subject: Get rid of post-specific rendering
......................................................................
Get rid of post-specific rendering
AFAIK, this is no longer used; post permalink now links to topic, with the
postId as anchor to highlight the specific post
Change-Id: Ib6d2ac19b27d4354cf3d3f2654836519546db41d
---
M includes/Block/Topic.php
1 file changed, 6 insertions(+), 20 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index f3c1c06..39c4873 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -363,7 +363,7 @@
if ( !$this->permissions->isAllowed( $root, 'view' ) ) {
throw new \MWException( 'Not Allowed' );
}
- if ( ! isset( $options['topiclist-block'] ) ) {
+ if ( !isset( $options['topiclist-block'] ) ) {
$prefix = $templating->render(
'flow:topic-permalink-warning.html.php',
array(
@@ -373,25 +373,11 @@
);
}
- if ( isset( $options['postId'] ) ) {
- $indexDescendant = $root->registerDescendant(
$options['postId'] );
- $post = $root->getRecursiveResult(
$indexDescendant );
- if ( $post === null ) {
- throw new \MWException( 'Requested
postId is not available within post tree' );
- }
-
- return $prefix . $templating->renderPost(
- $post,
- $this,
- $return
- );
- } else {
- return $prefix . $templating->renderTopic(
- $root,
- $this,
- $return
- );
- }
+ return $prefix . $templating->renderTopic(
+ $root,
+ $this,
+ $return
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/94881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6d2ac19b27d4354cf3d3f2654836519546db41d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[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
