jenkins-bot has submitted this change and it was merged.
Change subject: Show who moderated the most recent revision
......................................................................
Show who moderated the most recent revision
Change-Id: I14152b1a20557598211aeff7b2f685769af2568e
---
M includes/Templating.php
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Templating.php b/includes/Templating.php
index 331e4c9..a9e463a 100644
--- a/includes/Templating.php
+++ b/includes/Templating.php
@@ -339,6 +339,7 @@
if ( $this->permissions->isAllowed( $revision, 'view' ) ) {
return $this->usernames->get( wfWikiId(),
$revision->getUserId(), $revision->getUserIp() );
} else {
+ $revision = $this->getModeratedRevision( $revision );
$username = $this->usernames->get(
wfWikiId(),
$revision->getModeratedByUserId(),
@@ -371,6 +372,7 @@
$username = $this->usernames->get( wfWikiId(),
$revision->getUserId(), $revision->getUserIp() );
return Linker::userLink( $userid, $username ) .
Linker::userToolLinks( $userid, $username );
} else {
+ $revision = $this->getModeratedRevision( $revision );
$state = $revision->getModerationState();
$username = $this->usernames->get(
wfWikiId(),
@@ -414,6 +416,7 @@
$revision->getCreatorIp()
);
} else {
+ $revision = $this->getModeratedRevision( $revision );
$state = $revision->getModerationState();
$username = $this->usernames->get(
wfWikiId(),
@@ -463,6 +466,7 @@
return $content;
} else {
+ $revision = $this->getModeratedRevision( $revision );
$username = $this->usernames->get(
wfWikiId(),
$revision->getModeratedByUserId(),
@@ -494,6 +498,7 @@
if ( $state === $revision::MODERATED_NONE ) {
return '';
}
+ $revision = $this->getModeratedRevision( $revision );
$username = $this->usernames->get(
wfWikiId(),
$revision->getModeratedByUserId(),
@@ -527,4 +532,11 @@
}
}
+ protected function getModeratedRevision( AbstractRevision $revision ) {
+ if ( $revision->isModerated() ) {
+ return $revision;
+ } else {
+ return Container::get( 'collection.cache'
)->getLastRevisionFor( $revision );
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/117382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14152b1a20557598211aeff7b2f685769af2568e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
