Mount the old previews in a separate folder for the multi bucket setup and check in them before using the actual locations

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/private/Preview/Storage/Root.php b/lib/private/Preview/Storage/Root.php
index 107d87c6301..37ae1758121 100644
--- a/lib/private/Preview/Storage/Root.php
+++ b/lib/private/Preview/Storage/Root.php
@@ -41,6 +41,17 @@ class Root extends AppData {
 		$internalFolder = $this->getInternalFolder($name);
 
 		try {
+			return parent::getFolder('old-multibucket/' . $internalFolder);
+		} catch (NotFoundException $e) {
+			// not in multibucket fallback #1
+		}
+		try {
+			return parent::getFolder('old-multibucket/' . $name);
+		} catch (NotFoundException $e) {
+			// not in multibucket fallback #2
+		}
+
+		try {
 			return parent::getFolder($internalFolder);
 		} catch (NotFoundException $e) {
 			/*