Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/112161
Change subject: Some permission fixes ...................................................................... Some permission fixes 'view' is checked against Header objects too. We currently have no moderation for those, so this wasn't called, but it should really be more general than just PostRevision ;) Also pretty sure that all users can see log excerpts for hidden/deleted stuff, at least that's how it works in other parts of MW (deletion log is accessible to all) Change-Id: I62413fc89422d8d98842e0f2b03ab0bdc093c343 --- M FlowActions.php 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/61/112161/1 diff --git a/FlowActions.php b/FlowActions.php index c284c4c..408e308 100644 --- a/FlowActions.php +++ b/FlowActions.php @@ -1,5 +1,6 @@ <?php +use Flow\Model\AbstractRevision; use Flow\Model\PostRevision; use Flow\Model\Header; use Flow\Model\UUID; @@ -475,11 +476,8 @@ 'log_type' => false, 'permissions' => array( PostRevision::MODERATED_NONE => '', - PostRevision::MODERATED_HIDDEN => function( PostRevision $post, RevisionActionPermissions $permissions ) { - // visible for logged in users (or anyone with hide permission) - return $permissions->getUser()->isLoggedIn() ? '' : 'flow-hide'; - }, - PostRevision::MODERATED_DELETED => array( 'flow-delete', 'flow-suppress' ), + PostRevision::MODERATED_HIDDEN => '', + PostRevision::MODERATED_DELETED => '', PostRevision::MODERATED_SUPPRESSED => 'flow-suppress', ), 'button-method' => 'GET', @@ -490,10 +488,10 @@ 'log_type' => false, // don't log views 'permissions' => array( PostRevision::MODERATED_NONE => '', - PostRevision::MODERATED_HIDDEN => function( PostRevision $post, RevisionActionPermissions $permissions ) { - // visible for logged in users (or anyone with hide permission) - return $permissions->getUser()->isLoggedIn() ? '' : 'flow-hide'; - }, + PostRevision::MODERATED_HIDDEN => function( AbstractRevision $post, RevisionActionPermissions $permissions ) { + // visible for logged in users (or anyone with hide permission) + return $permissions->getUser()->isLoggedIn() ? '' : 'flow-hide'; + }, PostRevision::MODERATED_DELETED => array( 'flow-delete', 'flow-suppress' ), PostRevision::MODERATED_SUPPRESSED => 'flow-suppress', ), -- To view, visit https://gerrit.wikimedia.org/r/112161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I62413fc89422d8d98842e0f2b03ab0bdc093c343 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits