Matthias Mullie has submitted this change and it was merged.

Change subject: failsafe to make sure that feedback that doesn't get archived, 
does not continue to show up in archive_scheduled
......................................................................


failsafe to make sure that feedback that doesn't get archived, does not 
continue to show up in archive_scheduled

Change-Id: Ia7db0db8799ea535fbe614838949b83182c0f841
---
M maintenance/archiveFeedback.php
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Matthias Mullie: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/maintenance/archiveFeedback.php b/maintenance/archiveFeedback.php
index 1f75c0a..dc78c10 100644
--- a/maintenance/archiveFeedback.php
+++ b/maintenance/archiveFeedback.php
@@ -84,9 +84,15 @@
                                        $note = wfMessage( 
'articlefeedbackv5-activity-note-archive', $days )->escaped();
 
                                        $flagger = new 
ArticleFeedbackv5Flagging( null, $feedback->aft_id, $feedback->aft_page );
-                                       $flagger->run( 'archive', $note, false, 
'job' );
+                                       $success = $flagger->run( 'archive', 
$note, false, 'job' );
 
-                                       $this->completeCount++;
+                                       if ( $success ) {
+                                               $this->completeCount++;
+                                       } else {
+                                               // if we could not flag, unmark 
as archive_schedule
+                                               $feedback->aft_archive_date = 
null;
+                                               $feedback->update();
+                                       }
 
                                        $break = false;
                                }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7db0db8799ea535fbe614838949b83182c0f841
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to