From f3d087acf47671f69e68a93635d05b734c51ceec Mon Sep 17 00:00:00 2001
From: nineya <361654768@qq.com>
Date: Wed, 22 Mar 2023 15:36:57 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/common/widget.html | 2 +-
 templates/widget/notice.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/common/widget.html b/templates/common/widget.html
index c482dd9..130fd78 100644
--- a/templates/common/widget.html
+++ b/templates/common/widget.html
@@ -3,7 +3,7 @@
        class="column column-side column-${position} ${settings[position+'_sidebar_sticky']!'none'}-sticky">
   <th:block th:each="sidebar :${theme.config.sidebar.sidebar_show}">
     <th:block th:if="${sidebar.position == position}">
-      <th:block th:replace="${'/widget/' + sidebar.type}" />
+      <th:block th:replace="~{${'/widget/' + sidebar.type}}" />
     </th:block>
   </th:block>
   <div th:if="${position == 'left'}" class="column-right-shadow is-hidden-desktop">
diff --git a/templates/widget/notice.html b/templates/widget/notice.html
index 17afa9c..aa45888 100644
--- a/templates/widget/notice.html
+++ b/templates/widget/notice.html
@@ -1,8 +1,8 @@
-<div class="card widget notice ${settings.hide_notice!} is-hidden-all">
+<div class="card widget notice ${settings.hide_notice!} is-hidden-all" xmlns:th="https://www.thymeleaf.org">
     <div class="card-title">
         <i class="fa fa-volume-up card-title-label"></i><span>公告</span>
     </div>
     <div class="card-content">
-        <div>${settings.notice_content!'<p>&emsp;&emsp;欢迎来访${blog_title!}，博主还没有发布任何公告！</p>'}</div>
+        <div th:text="${#strings.isEmpty(theme.config.sidebar.notice_content)? '<p>&emsp;&emsp;欢迎来访' + site.title + '，博主还没有发布任何公告！</p>' : theme.config.sidebar.notice_content}"></div>
     </div>
 </div>
\ No newline at end of file