EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95536
Change subject: Repair per-post topic history
......................................................................
Repair per-post topic history
Refactors in the topic moderation patch broke per-post topic history,
this brings back fixes most likely lost in a rebase.
Change-Id: Ice4a3a23b642ec527ee55edb5c937ac48fad13e6
---
M includes/Block/Topic.php
M templates/post-history.html.php
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/36/95536/1
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index bfb358c..4dccd4b 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -437,9 +437,9 @@
return $templating->render( "flow:post-history.html.php", array(
'block' => $this,
'topic' => $this->workflow,
- 'root' => $root,
+ 'topicTitle' => $this->loadTopicTitle(), // pre-loaded
by loadRequestedPost
'post' => $post,
- 'history' => new History( $history ),
+ 'history' => new History( $this->getHistory(
$options['postId'] ) ),
'historyRenderer' => new HistoryRenderer( $templating,
$this ),
) );
}
diff --git a/templates/post-history.html.php b/templates/post-history.html.php
index 59a521a..5398806 100644
--- a/templates/post-history.html.php
+++ b/templates/post-history.html.php
@@ -1,10 +1,10 @@
<?php
-$topicTitle = $this->getContent( $root, 'wikitext', $user );
+$titleText = $this->getContent( $topicTitle, 'wikitext', $user );
$topicLink = $this->generateUrl( $topic );
$creator = $post->getCreatorName();
-$title = wfMessage( 'flow-post-history', $topicTitle, $creator )->escaped();
+$title = wfMessage( 'flow-post-history', $titleText, $creator )->escaped();
$this->getOutput()->setHtmlTitle( $title );
$this->getOutput()->setPageTitle( $title );
@@ -14,7 +14,7 @@
<div class="flow-history-container">
<p class='flow-history-pages'>
<span class="plainlinks">
- <?php echo wfMessage( 'flow-history-pages-post',
$topicLink, $topicTitle )->parse(); ?>
+ <?php echo wfMessage( 'flow-history-pages-post',
$topicLink, $titleText )->parse(); ?>
</span>
</p>
--
To view, visit https://gerrit.wikimedia.org/r/95536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice4a3a23b642ec527ee55edb5c937ac48fad13e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
