refs #312

lib/models/Courseware/BlockTypes/BlockType.php

@@ -303,9 +303,9 @@ abstract class BlockType
     protected function copyFileById(string $fileId, string $rangeId): string
     {
         $user = \User::findCurrent();
-
+        if ($file_ref = \FileRef::find($fileId)) {
             $copiedFile = \FileManager::copyFile(
-            \FileRef::find($fileId)->getFiletype(),
+                $file_ref->getFiletype(),
                 $this->getDestinationFolder($user, $rangeId),
                 $user
             );
@@ -313,6 +313,9 @@ abstract class BlockType
             return $copiedFile->id;
         }
 
+        return '';
+    }
+
     /**
      * Copies a folder to a specified range.
      *
@@ -325,9 +328,9 @@ abstract class BlockType
     {
         $user = \User::findCurrent();
         $destinationFolder = $this->getDestinationFolder($user, $rangeId);
-        $sourceFolder = \Folder::find($folderId)->getTypedFolder();
+        if ($sourceFolder = \Folder::find($folderId)) {
             $copiedFolder = \FileManager::copyFolder(
-            $sourceFolder,
+                $sourceFolder->getTypedFolder(),
                 $destinationFolder,
                 $user
             );
@@ -335,6 +338,9 @@ abstract class BlockType
             return $copiedFolder->id;
         }
 
+        return '';
+    }
+
     private function getDestinationFolder(\User $user, string $rangeId): \StandardFolder
     {
         $rootFolder = \Folder::findTopFolder($rangeId);