jenkins-bot has submitted this change and it was merged.
Change subject: Repair missed conversion to new username lookup
......................................................................
Repair missed conversion to new username lookup
Change-Id: Ib79a13da59c79db54fbd24ef3837db1b5ff6a7d0
---
M includes/Model/AbstractRevision.php
M includes/Templating.php
M includes/View/Post.php
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index 8535860..da1efe8 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -518,6 +518,14 @@
return $this->lastEditId;
}
+ public function getLastContentEditUserId() {
+ return $this->lastEditUserId;
+ }
+
+ public function getLastContentEditUserIp() {
+ return $this->lastEditUserIp;
+ }
+
public function getModeratedByUserId() {
return $this->moderatedByUserId;
}
diff --git a/includes/Templating.php b/includes/Templating.php
index ac979a1..c453780 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -441,7 +441,7 @@
// Messages: flow-hide-post-content,
flow-delete-post-content, flow-suppress-post-content
// flow-hide-title-content,
flow-delete-title-content, flow-suppress-title-content
- $message = wfMessage( "flow-$state-$type-content",
$user, $this->getUserLinks( $revision, $user ) );
+ $message = wfMessage( "flow-$state-$type-content",
$username, $this->getUserLinks( $revision, $permissionsUser ) );
if ( $message->exists() ) {
return $message->escaped();
} else {
diff --git a/includes/View/Post.php b/includes/View/Post.php
index f5eab29..b079d94 100644
--- a/includes/View/Post.php
+++ b/includes/View/Post.php
@@ -165,12 +165,18 @@
public function createModifiedTipsyHtml( AbstractBlock $block ) {
$html = '';
- if ( $this->post->getLastContentEditorName() ) {
+ if ( $this->post->getLastContentEditId() ) {
+ $name = $this->usernames->get(
+ wfWikiId(),
+ $this->post->getLastContentEditUserId(),
+ $this->post->getLastContentEditUserIp()
+ );
+
$html .= Html::openElement( 'div', array( 'class' =>
'flow-content-modified-tipsy-flyout' ) );
$html .= Html::element(
'div',
array( 'class' => 'flow-last-modified-user' ),
- wfMessage( 'flow-last-modified-by',
$this->post->getLastContentEditorName() )->text()
+ wfMessage( 'flow-last-modified-by', $name
)->text()
);
$html .= Html::openElement( 'div', array( 'class' =>
'flow-show-change-link' ) );
$html .= Html::element( 'a', array( 'href' =>
$this->getLatestDiffLink( $block ) ), wfMessage( 'flow-show-change' )->text() );
--
To view, visit https://gerrit.wikimedia.org/r/104816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib79a13da59c79db54fbd24ef3837db1b5ff6a7d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
