From 1b5e7d3ae790c69b7f4b157524f710c41d6ae235 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Mon, 31 Jul 2023 09:55:28 +0000
Subject: [PATCH] FileManager::moveFolder: use FileType instead of FileRef, re
#2980
Merge request studip/studip!1999
---
lib/filesystem/FileManager.php | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/lib/filesystem/FileManager.php b/lib/filesystem/FileManager.php
index bfa40424e32..21eb27aec20 100644
--- a/lib/filesystem/FileManager.php
+++ b/lib/filesystem/FileManager.php
@@ -1100,15 +1100,13 @@ class FileManager
}
//now go through all files and move them, too:
- foreach ($source_folder->getFiles() as $file_ref) {
- if (!($file_ref instanceof FileRef)) {
- $file_ref = FileRef::build((array) $file_ref, false);
- $file_ref->setFolderType('foldertype', $source_folder);
- }
- $result = self::moveFile($file_ref->getFileType(), $new_folder, $user);
- if (!$result instanceof FileRef) {
- //error
- return $result;
+ foreach ($source_folder->getFiles() as $file) {
+ if ($file instanceof FileType) {
+ $result = self::moveFile($file, $new_folder, $user);
+ if (!$result instanceof FileType) {
+ //error
+ return $result;
+ }
}
}
--
GitLab