Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/93968


Change subject: Fixes in FlowActions
......................................................................

Fixes in FlowActions

* Header namespace was not correctly used (so Header typehint was assumed as 
\Header)
* Restoring clears out moderatedByUserText, so we have to use userText there

Change-Id: I69bfa59313d266c36683079c2792c5f9587a6929
---
M FlowActions.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/68/93968/1

diff --git a/FlowActions.php b/FlowActions.php
index ad54194..5f0c5a0 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -1,6 +1,7 @@
 <?php
 
 use Flow\Model\PostRevision;
+use Flow\Model\Header;
 use Flow\PostActionPermissions;
 use Flow\Log\Logger;
 use Flow\UrlGenerator;
@@ -239,7 +240,9 @@
                        'i18n-message' => 'flow-rev-message-restored-post',
                        'i18n-params' => array(
                                function ( PostRevision $revision, UrlGenerator 
$urlGenerator, User $user, Block $block ) {
-                                       return 
$revision->getModeratedByUserText();
+                                       // moderatedByUserText is null for 
restored (because that
+                                       // actually reverts any moderation to 
MODERATED_NONE)
+                                       return $revision->getUserText( $user );
                                },
                                function ( PostRevision $revision, UrlGenerator 
$urlGenerator, User $user, Block $block ) {
                                        return $revision->getUserText( $user );

-- 
To view, visit https://gerrit.wikimedia.org/r/93968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69bfa59313d266c36683079c2792c5f9587a6929
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to