Skip to content
Snippets Groups Projects
Commit 1b5e7d3a authored by Moritz Strohm's avatar Moritz Strohm
Browse files

FileManager::moveFolder: use FileType instead of FileRef, re #2980

Merge request studip/studip!1999
parent 7e955aed
No related branches found
No related tags found
No related merge requests found
......@@ -1100,17 +1100,15 @@ 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) {
foreach ($source_folder->getFiles() as $file) {
if ($file instanceof FileType) {
$result = self::moveFile($file, $new_folder, $user);
if (!$result instanceof FileType) {
//error
return $result;
}
}
}
$source_folder->delete();
return $new_folder;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment