revisiondelete: Fix $oldBits/$newBits usage in setVisibility()

This addresses the FIXME comment around updateLog()

Change-Id: Iedb9df0b4cf65308a6b58bd9d9295d1850bc2c28

diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php
index f9b7875..c205626 100644 (file)
--- a/includes/logging/DeleteLogFormatter.php
+++ b/includes/logging/DeleteLogFormatter.php
@@ -61,6 +61,7 @@ class DeleteLogFormatter extends LogFormatter {
                                        && in_array( $params[3], [ 'revision', 'archive', 'oldimage', 'filearchive' ] )
                                )
                        ) {
+                               // See RevDelList::getLogParams()/RevDelLogList::getLogParams()
                                $paramStart = $subtype === 'revision' ? 4 : 3;
 
                                $old = $this->parseBitField( $params[$paramStart + 1] );

diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index 79d66a9..87e641d 100644 (file)
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -125,7 +125,13 @@ abstract class RevDelList extends RevisionListBase {
                        $status->itemStatuses = [];
                }
 
+               // For multi-item deletions, set the old/new bitfields in log_params such that "hid X"
+               // shows in logs if field X was hidden from ANY item and likewise for "unhid Y". Note the
+               // form does not let the same field get hidden and unhidden in different items at once.
+               $virtualOldBits = 0;
+               $virtualNewBits = 0;
                $logType = 'delete';
+
                // @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
                for ( $this->reset(); $this->current(); $this->next() ) {
                        // @codingStandardsIgnoreEnd
@@ -187,6 +193,11 @@ abstract class RevDelList extends RevisionListBase {
                                if ( ( $oldBits | $newBits ) & $this->getSuppressBit() ) {
                                        $logType = 'suppress';
                                }
+                               // Track which fields where (un)hidden for each item
+                               $addedBits = ( $oldBits ^ $newBits ) & $newBits;
+                               $removedBits = ( $oldBits ^ $newBits ) & $oldBits;
+                               $virtualNewBits |= $addedBits;
+                               $virtualOldBits |= $removedBits;
 
                                $status->successCount++;
                                if ( $item->getAuthorId() > 0 ) {
@@ -228,14 +239,13 @@ abstract class RevDelList extends RevisionListBase {
                }
 
                // Log it
-               // @FIXME: $newBits/$oldBits set in for loop, makes IDE warnings too
                $this->updateLog(
                        $logType,
                        [
                                'title' => $this->title,
                                'count' => $successCount,
-                               'newBits' => $newBits,
-                               'oldBits' => $oldBits,
+                               'newBits' => $virtualNewBits,
+                               'oldBits' => $virtualOldBits,
                                'comment' => $comment,
                                'ids' => $idsForLog,
                                'authorIds' => $authorIds,