]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #22139 from nextcloud/fix/noid/check-for-preview-multibucket-fallb...
authorMorris Jobke <hey@morrisjobke.de>
Fri, 7 Aug 2020 14:02:02 +0000 (16:02 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Aug 2020 14:02:02 +0000 (16:02 +0200)
Check previews in multibucket fallback folder as the last step and not as first step

1  2 
lib/private/Preview/Storage/Root.php

index 2a3367b83b7f882e6253e38415c54383c980a84f,a2efc8196a8482e29eb7ccb422a9a7518b1b6bba..2df90fa5a0564b47b3dca2425161a48cf413402a
@@@ -41,16 -41,8 +41,8 @@@ class Root extends AppData 
  
  
        public function getFolder(string $name): ISimpleFolder {
 -              $internalFolder = $this->getInternalFolder($name);
 +              $internalFolder = self::getInternalFolder($name);
  
-               if ($this->isMultibucketPreviewDistributionEnabled) {
-                       try {
-                               return parent::getFolder('old-multibucket/' . $internalFolder);
-                       } catch (NotFoundException $e) {
-                               // not in multibucket fallback
-                       }
-               }
                try {
                        return parent::getFolder($internalFolder);
                } catch (NotFoundException $e) {