fix order during copy, don't use self to access methods on $this, fixes #1361

Closes #1361

Merge request studip/studip!892

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/models/Courseware/Container.php b/lib/models/Courseware/Container.php
index b42856d..1f621e5 100644
--- a/lib/models/Courseware/Container.php
+++ b/lib/models/Courseware/Container.php
@@ -120,7 +120,7 @@ class Container extends \SimpleORMap
 
         $container->store();
 
-        $blockMap = self::copyBlocks($user, $container, $this);
+        $blockMap = $this->copyBlocks($user, $container);
 
         $container['payload'] = $container->type->copyPayload($blockMap);
 
@@ -129,13 +129,11 @@ class Container extends \SimpleORMap
         return $container;
     }
 
-    private function copyBlocks(User $user, Container $newContainer, Container $remoteContainer): array
+    private function copyBlocks(User $user, Container $newContainer): array
     {
         $blockMap = [];
 
-        $blocks = Block::findBySQL('container_id = ?', [$remoteContainer->id]);
-
-        foreach ($blocks as $block) {
+        foreach ($this->blocks as $block) {
             $newBlock = $block->copy($user, $newContainer);
             $blockMap[$block->id] = $newBlock->id;
         }