Merge pull request #18293 from craftcms/bugfix/legacy-element-namespace-and-bugs

Bugfix/legacy element namespace and bugs

Author: riasvdv

resources/templates/assets/_index.twig

@@ -1,6 +1,6 @@
 {% extends '_layouts/elementindex.twig' %}
 {% set title = "Assets"|t('app') %}
-{% set elementType = 'craft\\elements\\Asset' %}
+{% set elementType = 'CraftCms\\Cms\\Asset\\Elements\\Asset' %}
 
 {% do view.registerAssetBundle("craft\\web\\assets\\fileupload\\FileUploadAsset") %}
 {% do view.registerAssetBundle("craft\\web\\assets\\prismjs\\PrismJsAsset") %}

resources/templates/entries/index.twig

@@ -1,14 +1,14 @@
 {% extends "_layouts/elementindex" %}
 
-{% if page is defined and not craft.elementSources.pageExists("craft\\elements\\Entry", page) %}
-  {% set firstPage = craft.elementSources.getFirstPage("craft\\elements\\Entry") %}
+{% if page is defined and not craft.elementSources.pageExists("CraftCms\\Cms\\Entry\\Elements\\Entry", page) %}
+  {% set firstPage = craft.elementSources.getFirstPage("CraftCms\\Cms\\Entry\\Elements\\Entry") %}
   {% if firstPage or (not firstPage and page != 'entries') %}
     {% redirect 'content/' ~ (firstPage ? firstPage|kebab : 'entries') %}
   {% endif %}
 {% endif %}
 
 {% set title = "Entries"|t('app') %}
-{% set elementType = 'craft\\elements\\Entry' %}
+{% set elementType = 'CraftCms\\Cms\\Entry\\Elements\\Entry' %}
 
 {% if sectionHandle is defined %}
   {% js %}

resources/templates/settings/users/fields.twig

@@ -16,7 +16,7 @@
 
         {{ forms.fieldLayoutDesignerField({
             first: true,
-            fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('craft\\elements\\User'),
+            fieldLayout: fieldLayout ?? craft.fields.getLayoutByType('CraftCms\\Cms\\User\\Elements\\User'),
             withGeneratedFields: true,
             withCardViewDesigner: true,
             disabled: readOnly,

resources/templates/users/_index.twig

@@ -3,7 +3,7 @@
 {% endif %}
 
 {% extends "_layouts/elementindex" %}
-{% set elementType = 'craft\\elements\\User' %}
+{% set elementType = 'CraftCms\\Cms\\User\\Elements\\User' %}
 
 {% set canHaveDrafts = craft.users().drafts().draftOf(false).savedDraftsOnly().exists() %}
 

src/Element/Element.php

@@ -4461,7 +4461,7 @@ public function getEnabledForSite(?int $siteId = null): ?bool
     public function setEnabledForSite(array|bool $enabledForSite): void
     {
         if (is_array($enabledForSite)) {
-            $this->_enabledForSite = array_map(fn ($value) => $value, $enabledForSite);
+            $this->_enabledForSite = array_map(fn (bool $value) => $value, $enabledForSite);
         } else {
             $this->_enabledForSite = $enabledForSite;
         }

yii2-adapter/legacy/helpers/ElementHelper.php

@@ -385,7 +385,7 @@ public static function siteStatusesForElement(ElementInterface $element, bool $e
             ->status(null)
             ->trashed(null)
             ->asArray()
-            ->select(['elements_sites.siteId', 'elements_sites.enabled'])
+            ->select(['siteId', 'enabled'])
             ->pluck('enabled', 'siteId')
             ->map(fn($enabled) => (bool)$enabled)
             ->all();