jenkins-bot has submitted this change and it was merged.

Change subject: Only allow Thanks for public revisions
......................................................................


Only allow Thanks for public revisions

Bug: 54100
Change-Id: Ied2846076ecf86b7045563fe5f2b0c002bd42647
---
M ApiThank.php
M Thanks.hooks.php
2 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Bsitu: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ApiThank.php b/ApiThank.php
index 7febee5..913b7aa 100644
--- a/ApiThank.php
+++ b/ApiThank.php
@@ -28,6 +28,8 @@
                $result = array();
                if ( !$rev ) {
                        $this->dieUsage( 'Revision ID is not valid', 
'invalidrevision' );
+               } elseif ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $this->dieUsage( 'Revision has been deleted', 
'revdeleted' );
                } else {
                        // Do not send notification if session data says "it 
has already been sent"
                        if ( !$agent->getRequest()->getSessionData( 
"thanks-thanked-{$rev->getId()}" ) ) {
diff --git a/Thanks.hooks.php b/Thanks.hooks.php
index e7c4536..b324783 100644
--- a/Thanks.hooks.php
+++ b/Thanks.hooks.php
@@ -25,6 +25,7 @@
                        && !$wgUser->isAnon()
                        && $rev->getUser() !== $wgUser->getId()
                        && !$wgUser->isBlocked()
+                       && !$rev->isDeleted( Revision::DELETED_TEXT )
                ) {
                        $recipient = User::newFromId( $rev->getUser() );
                        $recipientAllowed = true;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2846076ecf86b7045563fe5f2b0c002bd42647
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to