diff options
| author | Louis Chemineau <louis@chmn.me> | 2025-02-03 12:53:46 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-02-26 13:25:16 +0000 |
| commit | 854c3bcc6240ecc860382882164c66b07e1f660e (patch) | |
| tree | 3fdfdf51936a991580bde5ad644ceca9801fd9e0 | |
| parent | 5498f99b119d984ffaa359f39cf68ccc411fd7dc (diff) | |
| download | nextcloud-server-backport/51050/stable30.tar.gz nextcloud-server-backport/51050/stable30.zip | |
fix: Report duplicated extra files in integrity checkbackport/51050/stable30
The `array_diff` is not comparing the array keys. This means that an extra key with an expected hash will not be reported. Using `array_diff_assoc` will report such files.
For example, copying `status.php` to `status 2.php`, will only be reported with the new version.
Signed-off-by: Louis Chemineau <louis@chmn.me>
| -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 d38ccf497f4..7bd05276b7e 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -333,8 +333,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) { |