jenkins-bot has submitted this change and it was merged. Change subject: Some minor optimizations when checking permissions ......................................................................
Some minor optimizations when checking permissions Change-Id: I46b7310302c3d6c1be7e3e0fa0879a1ad6b57ed3 --- M includes/RevisionActionPermissions.php 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/RevisionActionPermissions.php b/includes/RevisionActionPermissions.php index bb3eb56..adffc1e 100644 --- a/includes/RevisionActionPermissions.php +++ b/includes/RevisionActionPermissions.php @@ -57,7 +57,8 @@ $allowed = $this->isRevisionAllowed( $revision, $action ); // if there was no revision object, it's pointless to find last revision - if ( $revision === null ) { + // if we already fail, no need in checking most recent revision status + if ( $revision === null || !$allowed ) { return $allowed; } @@ -67,7 +68,8 @@ // current state of an object, so checking against a revision at one // point in time alone isn't enough. $last = $revision->getCollection()->getLastRevision(); - return $allowed && $this->isRevisionAllowed( $last, $action ); + $isLastRevision = $last->getRevisionId()->equals( $revision->getRevisionId() ); + return $allowed && ( $isLastRevision || $this->isRevisionAllowed( $last, $action ) ); // If data is not in storage, just return that revision's status } catch ( InvalidDataException $e ) { -- To view, visit https://gerrit.wikimedia.org/r/114992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46b7310302c3d6c1be7e3e0fa0879a1ad6b57ed3 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <mmul...@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