diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2025-04-07 09:55:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2025-04-07 09:55:22 +0000 |
| commit | b53bd618cc8a8fc18f5b1c04b56eb6c4941d1fd1 (patch) | |
| tree | e973433f091a074957de33e4e9c01ce3e794b4be | |
| parent | a110d43c402cef9f393d3e35fc510f8124460006 (diff) | |
| parent | d050670a83a45268df04f299d5daf014b57fe4b1 (diff) | |
| download | mediawikicore-b53bd618cc8a8fc18f5b1c04b56eb6c4941d1fd1.tar.gz mediawikicore-b53bd618cc8a8fc18f5b1c04b56eb6c4941d1fd1.zip | |
Merge "multiblocks: Prevent reuse of loop variable"
| -rw-r--r-- | includes/block/BlockUser.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/block/BlockUser.php b/includes/block/BlockUser.php index aa9ac9269fd4..3de0388d1611 100644 --- a/includes/block/BlockUser.php +++ b/includes/block/BlockUser.php @@ -587,7 +587,6 @@ class BlockUser { } $expectedTargetCount = 0; - $priorBlock = null; $priorBlocks = $this->getPriorBlocksForTarget(); if ( $this->blockToUpdate !== null ) { @@ -601,7 +600,7 @@ class BlockUser { } elseif ( $conflictMode === self::CONFLICT_NEW && $this->options->get( MainConfigNames::EnableMultiBlocks ) ) { - foreach ( $this->getPriorBlocksForTarget() as $priorBlock ) { + foreach ( $priorBlocks as $priorBlock ) { if ( $block->equals( $priorBlock ) ) { // Block settings are equal => user is already blocked $this->logger->debug( 'placeBlockInternal: ' . @@ -610,8 +609,10 @@ class BlockUser { } } $expectedTargetCount = null; + $priorBlock = null; $update = false; } elseif ( !$priorBlocks ) { + $priorBlock = null; $update = false; } else { // Reblock only if the caller wants so |