Resolve "Methode "Folder::findTopFolder()" prüft nicht auf Typ "RootFolder""

Closes #4008

Merge request studip/studip!3198

2 files changed, 7 insertions, 6 deletions

diff --git a/lib/filesystem/FileManager.php b/lib/filesystem/FileManager.php
index f18d3ff..9ac5ad2 100644
--- a/lib/filesystem/FileManager.php
+++ b/lib/filesystem/FileManager.php
@@ -1637,7 +1637,7 @@ class FileManager
      */
     public static function getInboxFolder(User $user)
     {
-        $top_folder = Folder::findTopFolder($user->id, 'user');
+        $top_folder = Folder::findTopFolder($user->id);
         if (!$top_folder) {
             return null;
         }
@@ -1680,7 +1680,7 @@ class FileManager
      */
     public static function getOutboxFolder(User $user)
     {
-        $top_folder = Folder::findTopFolder($user->id, 'user');
+        $top_folder = Folder::findTopFolder($user->id);
         if (!$top_folder) {
             return null;
         }
diff --git a/lib/models/Folder.php b/lib/models/Folder.php
index fcf4d98..9018151 100644
--- a/lib/models/Folder.php
+++ b/lib/models/Folder.php
@@ -339,14 +339,15 @@ class Folder extends SimpleORMap implements FeedbackRange
      * Note that the range_id parameter is mandatory!
      *
      * @param string range_id The ID of the Stud.IP object whose top folder shall be found.
+     * @param string folder_type The expected folder type related to the Stud.IP object (defaults to RootFolder, use MessageFolder for the top folder of a message)
      *
      * @returns Folder|null Folder object on success or null, if no folder can be created.
      **/
-    public static function findTopFolder($range_id)
+    public static function findTopFolder($range_id, $folder_type = 'RootFolder')
     {
         $top_folder = self::findOneBySQL(
-            "range_id = ? AND parent_id=''",
-            [$range_id]
+            "range_id = ? AND folder_type = ? AND parent_id=''",
+            [$range_id, $folder_type]
         );
 
         //top_folder may not exist!
@@ -359,7 +360,7 @@ class Folder extends SimpleORMap implements FeedbackRange
                 return null;
             }
 
-            $top_folder = self::createTopFolder($range_id, $range_type);
+            $top_folder = self::createTopFolder($range_id, $range_type, $folder_type);
         }
 
         return $top_folder;