]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #22135 from nextcloud/enh/noid/occ-preview-repair
authorMorris Jobke <hey@morrisjobke.de>
Fri, 7 Aug 2020 09:09:16 +0000 (11:09 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Aug 2020 09:09:16 +0000 (11:09 +0200)
Add occ preview:migrate to migrate previews from the old flat structure to a subfolder structure

1  2 
lib/composer/composer/autoload_classmap.php
lib/composer/composer/autoload_static.php
lib/private/Preview/Storage/Root.php

index a284b037b3558ff1d228c3822d3c3a39ee719597,1f332c3208516a836db7a75226364f99dd5f5453..2a3367b83b7f882e6253e38415c54383c980a84f
@@@ -41,16 -39,8 +41,16 @@@ 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) {