From cbbd8bc8d72840f665ae91262241e0660cedd8e8 Mon Sep 17 00:00:00 2001
From: seto1 <30764014+seto1@users.noreply.github.com>
Date: Sat, 23 Nov 2024 10:52:52 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88?=
 =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97=E9=A0=86=E5=BA=8F=E5=A4=89=E6=9B=B4=20(#4040?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/baser-core/src/Service/Admin/BcAdminContentsService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php b/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
index 8513b44ebb..5a632f5fc6 100644
--- a/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
+++ b/plugins/baser-core/src/Service/Admin/BcAdminContentsService.php
@@ -133,7 +133,7 @@ public function getLayoutTemplates(EntityInterface $content)
             if (in_array($parentTemplate, $templates)) {
                 unset($templates[$parentTemplate]);
             }
-            $templates = array_merge($templates, ['' => __d('baser_core', '親フォルダの設定に従う') . '（' . $parentTemplate . '）']);
+            $templates = array_merge(['' => __d('baser_core', '親フォルダの設定に従う') . '（' . $parentTemplate . '）'], $templates);
         }
         return $templates;
     }