Merge branch 'develop' into wip-laravel-11

Dheia · Jul 3, 2024 · 8c38ed7 · 8c38ed7
2 parents 4076d17 + 12a8562
commit 8c38ed7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
@@ -215,7 +215,7 @@ public function makeComponent($name, $cmsObject = null, $properties = [], $isSof
         }
 
         if (class_exists($className)) {
-            $component = App::make($className, [$cmsObject, $properties]);
+            $component = App::make($className, ['cmsObject' => $cmsObject, 'properties' => $properties]);
             $component->name = $name;
 
             return $component;

diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
@@ -88,7 +88,7 @@ protected function getData()
             foreach ($components as $componentInfo) {
                 $className = $componentInfo->className;
                 $alias = $componentInfo->alias;
-                $component = App::make($className, [null, []]);
+                $component = App::make($className);
 
                 if ($component->isHidden) {
                     continue;