From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 7 Aug 2020 14:02:02 +0000 (+0200)
Subject: Merge pull request #22139 from nextcloud/fix/noid/check-for-preview-multibucket-fallb... 
X-Git-Tag: v20.0.0beta1~111
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=408ed7ebd4c8da989fdbd45024cdec2e52a1f35c;p=nextcloud-server.git

Merge pull request #22139 from nextcloud/fix/noid/check-for-preview-multibucket-fallback-as-second-step

Check previews in multibucket fallback folder as the last step and not as first step
---

408ed7ebd4c8da989fdbd45024cdec2e52a1f35c
diff --cc lib/private/Preview/Storage/Root.php
index 2a3367b83b7,a2efc8196a8..2df90fa5a05
--- a/lib/private/Preview/Storage/Root.php
+++ b/lib/private/Preview/Storage/Root.php
@@@ -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) {