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:26:38 +0000 |
| commit | fe56b3ccc29fa5604bc588e7838989eb0264dbbc (patch) | |
| tree | c7344310c3373ae3fd0a6954ea486fa0c6b43ce2 | |
| parent | 3b49ee1c6b82b0c43502f710e0ad5817adbe3d5e (diff) | |
| download | nextcloud-server-fe56b3ccc29fa5604bc588e7838989eb0264dbbc.tar.gz nextcloud-server-fe56b3ccc29fa5604bc588e7838989eb0264dbbc.zip | |
fix: Report duplicated extra files in integrity checkbackport/51050/stable31
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 3a24e8632de..361fe8e9b2d 100644 --- a/lib/private/IntegrityCheck/Checker.php +++ b/lib/private/IntegrityCheck/Checker.php @@ -335,8 +335,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) { |