filtered basemodel already loaded array

degami · degami · commit 10030d1bc87d · 2021-01-26T21:35:28.000+01:00
diff --git a/app/base/abstracts/Models/BaseModel.php b/app/base/abstracts/Models/BaseModel.php
@@ -528,6 +528,8 @@ public static function loadMultiple(ContainerInterface $container, array $ids, b
             });
         }
 
+        $already_loaded = array_filter($already_loaded);
+
         $out = (!empty($ids) ? static::loadMultipleByCondition($container, ['id' => $ids], $reset) : []) +
             (!empty($already_loaded) ? array_intersect_key(static::$loadedObjects[static::defaultTableName()], array_flip($already_loaded)) : []);
 

Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,8 @@ public static function loadMultiple(ContainerInterface $container, array $ids, b`
`528`	`528`	`});`
`529`	`529`	`}`
`530`	`530`
	`531`	`+ $already_loaded = array_filter($already_loaded);`
	`532`	`+`
`531`	`533`	`$out = (!empty($ids) ? static::loadMultipleByCondition($container, ['id' => $ids], $reset) : []) +`
`532`	`534`	`(!empty($already_loaded) ? array_intersect_key(static::$loadedObjects[static::defaultTableName()], array_flip($already_loaded)) : []);`
`533`	`535`