aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2023-07-31 16:54:23 +0000
committerMoritz Strohm <strohm@data-quest.de>2023-07-31 16:54:23 +0000
commitf883fc3bda170637b47ab96d7649ba5947a3732a (patch)
tree953a010ca3d813e91e70e60a5d070ad6cbc887f9
parentd397db18b68963a47b39623d907a3a0134390f54 (diff)
FileManager::moveFolder: also check the destination folder before making a special treatment for StandardFolder, re #2985
Merge request studip/studip!2001
-rw-r--r--lib/filesystem/FileManager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filesystem/FileManager.php b/lib/filesystem/FileManager.php
index 21eb27a..55cd769 100644
--- a/lib/filesystem/FileManager.php
+++ b/lib/filesystem/FileManager.php
@@ -1060,7 +1060,7 @@ class FileManager
}
$new_folder = null;
- if ($source_folder instanceof StandardFolder) {
+ if (($source_folder instanceof StandardFolder) && ($destination_folder instanceof StandardFolder)) {
//Standard folders just have to be put below the
//destination folder.
$new_folder = $destination_folder->createSubfolder($source_folder);