MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366303 )

Change subject: Use group rights for viewlinktolatest instead of page rights.
......................................................................

Use group rights for viewlinktolatest instead of page rights.

Found during user testing.

Bug: T171004
Change-Id: I0d1084e9bfe5de2cabac4cb3985ef500ba44d9b7
---
M ApprovedRevs.hooks.php
M ApprovedRevs_body.php
2 files changed, 13 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ApprovedRevs 
refs/changes/03/366303/1

diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index de53f8a..e4e738a 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -446,7 +446,7 @@
                        return false;
                }
 
-               if ( ! $title->userCan( 'viewlinktolatest' ) ) {
+               if ( ! ApprovedRevs::userCanViewLatest( $title ) ) {
                        return false;
                }
 
@@ -823,7 +823,7 @@
 
                // If the user isn't supposed to see these kinds of
                // messages, exit.
-               if ( ! $title->userCan( 'viewlinktolatest' ) ) {
+               if ( ! ApprovedRevs::userCanViewLatest( $title ) ) {
                        return false;
                }
 
diff --git a/ApprovedRevs_body.php b/ApprovedRevs_body.php
index c384590..63417ff 100644
--- a/ApprovedRevs_body.php
+++ b/ApprovedRevs_body.php
@@ -142,6 +142,17 @@
                return $isApprovable;
        }
 
+       public static function userCanViewLatest( $title ) {
+               global $wgUser;
+
+               $permission = 'viewlinktolatest';
+               if ( ! $title->userCan( $permission )
+                        && ! $wgUser->isAllowed( $permission ) ) {
+                       return false;
+               }
+               return true;
+       }
+
        public static function userCanApprove( $title ) {
                global $egApprovedRevsSelfOwnedNamespaces, $wgUser;
                $permission = 'approverevisions';

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d1084e9bfe5de2cabac4cb3985ef500ba44d9b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>

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

Reply via email to