From a88dada446dbac0b3736422f5df3a85fc05bef0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=97=E3=83=B3=E3=82=BD=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=83=BB=E3=83=AF=E3=83=BC=E3=82=AF=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=83=E3=83=97=20=E6=B0=B8=E5=8E=9F=20=E7=AF=A4?=
 <nagahara@opensource-workshop.jp>
Date: Sun, 4 Jan 2026 14:37:58 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E8=A8=80=E8=AA=9E=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A7=E3=80=81HTML?=
 =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=89=E3=82=A8=E3=83=AA=E3=82=A2=E3=81=AE?=
 =?UTF-8?q?TITLE=E3=82=BF=E3=82=B0=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=81=8C?=
 =?UTF-8?q?=E6=BC=8F=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=B8=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=81=A7=E3=81=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/layouts/app.blade.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 86b279353..7e4dbd5ef 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -72,6 +72,16 @@
 @endif
     <meta property="og:url" content="{{ url()->current() }}">
 
+    {{-- サイト名（HTML HEADのTITLEタグ、Connect-CMSのタイトルバーに使用する） --}}
+@php
+    $override_site_name = null;
+    if (isset($page) && isset($page_tree)) {
+        $override_site_name = $page->getOverrideSiteName($page_tree);
+    } else {
+        $override_site_name = Configs::getConfigsValue($cc_configs, 'base_site_name', config('app.name', 'Connect-CMS'));
+    }
+@endphp
+
     {{-- Page --}}
 @if (isset($page))
     <meta name="_page_id" content="{{$page->id}}">
@@ -81,7 +91,7 @@
     {{-- CSRF Token --}}
     <meta name="csrf-token" content="{{csrf_token()}}">
     {{-- cc_configsのセット場所は、app\Http\Middleware\ConnectInit::handle(). 管理画面・一般画面全てのviewで参照できる --}}
-    <title>@if(isset($page)){{$page->page_name}} | @endif{{ Configs::getConfigsValue($cc_configs, 'base_site_name', config('app.name', 'Connect-CMS')) }}</title>
+    <title>@if(isset($page)){{$page->page_name}} | @endif{{$override_site_name}}</title>
 
     {{-- alternate --}}
 @if (app('request')->attributes->get('alternates'))
@@ -174,17 +184,7 @@
 <nav class="navbar navbar-expand-md bg-dark {{$base_header_font_color_class}} @if (Configs::getConfigsValue($cc_configs, 'base_header_fix') == '1') sticky-top @endif {{ $base_header_optional_class }}" aria-label="ヘッダー">
     <!-- Branding Image -->
     <a class="navbar-brand cc-custom-brand" href="{{ url('/') }}">
-        @php
-            $override_site_name = null;
-            if (isset($page) && isset($page_tree)) {
-                $override_site_name = $page->getOverrideSiteName($page_tree);
-            }
-        @endphp
-        @if(empty($override_site_name))
-            {{ Configs::getConfigsValue($cc_configs, 'base_site_name', config('app.name', 'Connect-CMS')) }}
-        @else
-            {{$override_site_name}}
-        @endif
+        {{$override_site_name}}
     </a>
 
     <!-- SmartPhone Button -->

From bd776f119ab977fb38f180b147a113f3cdd1e8f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=97=E3=83=B3=E3=82=BD=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=83=BB=E3=83=AF=E3=83=BC=E3=82=AF=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=83=E3=83=97=20=E6=B0=B8=E5=8E=9F=20=E7=AF=A4?=
 <nagahara@opensource-workshop.jp>
Date: Sun, 4 Jan 2026 14:57:59 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=88=E3=83=83=E3=83=97=E3=83=9A?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=A7=E3=82=B5?=
 =?UTF-8?q?=E3=82=A4=E3=83=88=E5=90=8D=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/layouts/app.blade.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 7e4dbd5ef..13f48ddfe 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -72,13 +72,19 @@
 @endif
     <meta property="og:url" content="{{ url()->current() }}">
 
-    {{-- サイト名（HTML HEADのTITLEタグ、Connect-CMSのタイトルバーに使用する） --}}
+{{-- サイト名（HTML HEADのTITLEタグ、Connect-CMSのタイトルバーに使用する） --}}
 @php
+    // ページがある場合、override_site_nameを取得する。
     $override_site_name = null;
     if (isset($page) && isset($page_tree)) {
         $override_site_name = $page->getOverrideSiteName($page_tree);
+    }
+    // ページにoverride_site_nameが設定されていない場合はサイト管理のサイト名を使用する。
+    $base_site_name = Configs::getConfigsValue($cc_configs, 'base_site_name', config('app.name', 'Connect-CMS'));
+    if (empty($override_site_name)) {
+        $site_name = $base_site_name;
     } else {
-        $override_site_name = Configs::getConfigsValue($cc_configs, 'base_site_name', config('app.name', 'Connect-CMS'));
+        $site_name = $override_site_name;
     }
 @endphp
 
@@ -91,7 +97,7 @@
     {{-- CSRF Token --}}
     <meta name="csrf-token" content="{{csrf_token()}}">
     {{-- cc_configsのセット場所は、app\Http\Middleware\ConnectInit::handle(). 管理画面・一般画面全てのviewで参照できる --}}
-    <title>@if(isset($page)){{$page->page_name}} | @endif{{$override_site_name}}</title>
+    <title>@if(isset($page)){{$page->page_name}} | @endif{{$site_name}}</title>
 
     {{-- alternate --}}
 @if (app('request')->attributes->get('alternates'))
@@ -184,7 +190,7 @@
 <nav class="navbar navbar-expand-md bg-dark {{$base_header_font_color_class}} @if (Configs::getConfigsValue($cc_configs, 'base_header_fix') == '1') sticky-top @endif {{ $base_header_optional_class }}" aria-label="ヘッダー">
     <!-- Branding Image -->
     <a class="navbar-brand cc-custom-brand" href="{{ url('/') }}">
-        {{$override_site_name}}
+        {{$site_name}}
     </a>
 
     <!-- SmartPhone Button -->