From 142458e0e50a513d11125832b86d2cb030d72fde Mon Sep 17 00:00:00 2001
From: ryuring <egashira@catchup.co.jp>
Date: Thu, 24 Oct 2024 13:52:45 +0900
Subject: [PATCH] Merge commit from fork
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* エラーメッセージ エスケープ追加

* useを追加

---------

Co-authored-by: seto <seto@catchup.co.jp>
---
 plugins/bc-admin-third/templates/Error/error400.php | 3 ++-
 plugins/bc-admin-third/templates/Error/error500.php | 3 ++-
 plugins/bc-front/templates/Error/error400.php       | 2 +-
 plugins/bc-front/templates/Error/error500.php       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/bc-admin-third/templates/Error/error400.php b/plugins/bc-admin-third/templates/Error/error400.php
index ad6daf6924..8524a0712a 100644
--- a/plugins/bc-admin-third/templates/Error/error400.php
+++ b/plugins/bc-admin-third/templates/Error/error400.php
@@ -10,6 +10,7 @@
  */
 
 use Cake\Core\Configure;
+use Cake\Error\Debugger;
 
 /**
  * @var \BaserCore\View\BcAdminAppView $this
@@ -44,7 +45,7 @@
 ?>
 
 
-<h2><?php echo $message ?></h2>
+<h2><?php echo h($message) ?></h2>
 <p class="error">
   <strong><?php echo __d('baser_core', 'エラー') ?>: </strong>
   <?php printf(
diff --git a/plugins/bc-admin-third/templates/Error/error500.php b/plugins/bc-admin-third/templates/Error/error500.php
index 0e4f0a75a7..47931f51f8 100644
--- a/plugins/bc-admin-third/templates/Error/error500.php
+++ b/plugins/bc-admin-third/templates/Error/error500.php
@@ -10,6 +10,7 @@
  */
 
 use Cake\Core\Configure;
+use Cake\Error\Debugger;
 
 /**
  * @var \BaserCore\View\BcAdminAppView $this
@@ -49,7 +50,7 @@
 ?>
 
 
-<h2><?php echo $message ?></h2>
+<h2><?php echo h($message) ?></h2>
 <p class="error">
   <strong><?php echo __d('baser_core', 'エラー') ?>: </strong>
   <?php printf(
diff --git a/plugins/bc-front/templates/Error/error400.php b/plugins/bc-front/templates/Error/error400.php
index 3f54b00f59..bc36f9b6ca 100755
--- a/plugins/bc-front/templates/Error/error400.php
+++ b/plugins/bc-front/templates/Error/error400.php
@@ -49,7 +49,7 @@
 ?>
 
 
-<h2 class="bs-error-title"><?php echo $message ?></h2>
+<h2 class="bs-error-title"><?php echo h($message) ?></h2>
 <div class="bs-error-body">
 	<strong><?php echo __d('baser_core', 'エラー'); ?>: </strong>
 	<?php printf(
diff --git a/plugins/bc-front/templates/Error/error500.php b/plugins/bc-front/templates/Error/error500.php
index a6e2d4b83b..5a68c42aae 100755
--- a/plugins/bc-front/templates/Error/error500.php
+++ b/plugins/bc-front/templates/Error/error500.php
@@ -53,7 +53,7 @@
 ?>
 
 
-<h2 class="bs-error-title"><?php echo $message ?></h2>
+<h2 class="bs-error-title"><?php echo h($message) ?></h2>
 <div class="bs-error-body">
 	<strong><?php echo __d('baser_core', 'エラー'); ?>: </strong>
 	<?php printf(