diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/cache/scanner.php | 2 | ||||
| -rw-r--r-- | lib/private/files/type/loader.php | 8 | ||||
| -rw-r--r-- | lib/public/files/imimetypeloader.php | 7 |
3 files changed, 16 insertions, 1 deletions
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php index f76ef5ba0dd..fb60ee5aa53 100644 --- a/lib/private/files/cache/scanner.php +++ b/lib/private/files/cache/scanner.php @@ -377,7 +377,7 @@ class Scanner extends BasicEmitter { // inserted mimetypes but those weren't available yet inside the transaction // To make sure to have the updated mime types in such cases, // we reload them here - $this->cache->loadMimetypes(); + \OC::$server->getMimeTypeLoader()->reset(); } foreach ($childQueue as $child => $childData) { diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php index df893306615..78bfcf60bff 100644 --- a/lib/private/files/type/loader.php +++ b/lib/private/files/type/loader.php @@ -97,6 +97,14 @@ class Loader implements IMimeTypeLoader { } /** + * Clear all loaded mimetypes, allow for re-loading + */ + public function reset() { + $this->mimetypes = []; + $this->mimetypeIds = []; + } + + /** * Store a mimetype in the DB * * @param string $mimetype diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php index 24937ea9b86..6d00c4a0b31 100644 --- a/lib/public/files/imimetypeloader.php +++ b/lib/public/files/imimetypeloader.php @@ -56,4 +56,11 @@ interface IMimeTypeLoader { * @since 8.2.0 */ public function exists($mimetype); + + /** + * Clear all loaded mimetypes, allow for re-loading + * + * @since 8.2.0 + */ + public function reset(); } |