D3Files component - copyFilesBetweenModels bugfix

d3yii2 · Apr 29, 2021 · b1fd461 · b1fd461
1 parent f538772
commit b1fd461
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/components/D3Files.php b/components/D3Files.php
@@ -197,9 +197,10 @@ public static function uploadModelFile(ActiveRecord  $model, string $className,
      */
     public static function copyFilesBetweenModels(ActiveRecord $modelFrom, ActiveRecord $modelTo, ?string $modelFromClass = null)
     {
-        $modelName = $modelFromClass ?? get_class($modelFrom);
+        $modelFromName = $modelFromClass ?? get_class($modelFrom);
+        $modelToName = get_class($modelTo);
 
-        $modelFiles = ModelD3Files::getRecordFilesList($modelName, $modelFrom->id);
+        $modelFiles = ModelD3Files::getRecordFilesList($modelFromName, $modelFrom->id);
 
         foreach ($modelFiles as $file) {
 
@@ -212,14 +213,14 @@ public static function copyFilesBetweenModels(ActiveRecord $modelFrom, ActiveRec
 
             $ext = pathinfo($file['file_name'], PATHINFO_EXTENSION);
 
-            $fileTypes = self::getAllowedFileTypes($modelName);
+            $fileTypes = self::getAllowedFileTypes($modelToName);
             if (!preg_match($fileTypes, $ext)) {
                 continue;
             }
 
             ModelD3Files::saveContent(
                 $file['file_name'],
-                $modelName,
+                $modelToName,
                 $modelTo->id,
                 $fileContent,
                 $fileTypes