diff options
| author | Louis <louis@chmn.me> | 2025-03-04 13:40:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 13:40:11 +0100 |
| commit | e906134afe10a0a97628cce3bbca6dd398637418 (patch) | |
| tree | 0d8754424592e68bbb45fa498a4fb4e46dfb8984 | |
| parent | d8040d7d7f22eea3ec1486522de013fc48b1bfc2 (diff) | |
| parent | 7588237dc001475b14063fae59c56e15b1b5f8ae (diff) | |
| download | nextcloud-server-e906134afe10a0a97628cce3bbca6dd398637418.tar.gz nextcloud-server-e906134afe10a0a97628cce3bbca6dd398637418.zip | |
Merge pull request #51060 from nextcloud/backport/51050/stable29
[stable29] fix: Report duplicated extra files in integrity check
| -rw-r--r-- | lib/private/IntegrityCheck/Checker.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/IntegrityCheck/Checker.php b/lib/private/IntegrityCheck/Checker.php index b17e4b1c0bf..32749a2c5f1 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -356,8 +356,8 @@ class Checker { // Compare the list of files which are not identical $currentInstanceHashes = $this->generateHashes($this->getFolderIterator($basePath), $basePath); - $differencesA = array_diff($expectedHashes, $currentInstanceHashes); - $differencesB = array_diff($currentInstanceHashes, $expectedHashes); + $differencesA = array_diff_assoc($expectedHashes, $currentInstanceHashes); + $differencesB = array_diff_assoc($currentInstanceHashes, $expectedHashes); $differences = array_unique(array_merge($differencesA, $differencesB)); $differenceArray = []; foreach ($differences as $filename => $hash) { |