diff options
| author | Robin Appelman <robin@icewind.nl> | 2024-12-16 14:57:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-16 14:57:03 +0100 |
| commit | b9da727b9ba8770881e4d441733806daaac5cd09 (patch) | |
| tree | 3c48c290995e5464e99dcec77912ba423d6cfafd | |
| parent | 7c59119c03c491f3534021b7011adfebf6e27b19 (diff) | |
| parent | 44e4fc5d419ffc9f5e2abf37489636f7e30cbd54 (diff) | |
| download | nextcloud-server-b9da727b9ba8770881e4d441733806daaac5cd09.tar.gz nextcloud-server-b9da727b9ba8770881e4d441733806daaac5cd09.zip | |
Merge pull request #49874 from nextcloud/ci/revert/47342
Revert "fix: don't recalculate folder size in Cache::delete if the en…
| -rw-r--r-- | build/psalm-baseline.xml | 5 | ||||
| -rw-r--r-- | lib/private/Files/Cache/Updater.php | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 3072407ef54..00add5ee78e 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1830,6 +1830,11 @@ <code><![CDATA[self::getGlobalCache()->getStorageInfo($storageId)]]></code> </NullableReturnStatement> </file> + <file src="lib/private/Files/Cache/Updater.php"> + <RedundantCondition> + <code><![CDATA[$this->cache instanceof Cache]]></code> + </RedundantCondition> + </file> <file src="lib/private/Files/Cache/Wrapper/CacheWrapper.php"> <LessSpecificImplementedReturnType> <code><![CDATA[array]]></code> diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php index 6cf3bd096d8..42812dbc882 100644 --- a/lib/private/Files/Cache/Updater.php +++ b/lib/private/Files/Cache/Updater.php @@ -152,6 +152,9 @@ class Updater implements IUpdater { $this->propagator->propagateChange($path, time(), -$entry->getSize()); } else { $this->propagator->propagateChange($path, time()); + if ($this->cache instanceof Cache) { + $this->cache->correctFolderSize($parent); + } } } |