Skip to content

Commit

Permalink
Merge branch '5.0.x' of github.com:baserproject/basercms into 5.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ryuring committed Oct 24, 2024
2 parents 1a5acb3 + 142458e commit 4ec1cab
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion plugins/bc-admin-third/templates/Error/error400.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

use Cake\Core\Configure;
use Cake\Error\Debugger;

/**
* @var \BaserCore\View\BcAdminAppView $this
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion plugins/bc-admin-third/templates/Error/error500.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

use Cake\Core\Configure;
use Cake\Error\Debugger;

/**
* @var \BaserCore\View\BcAdminAppView $this
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-front/templates/Error/error400.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion plugins/bc-front/templates/Error/error500.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 4ec1cab

Please sign in to comment.