From e9f20295c7e8447d3235315659add191aa4d949c Mon Sep 17 00:00:00 2001
From: nineya <lsw@nineya.com>
Date: Tue, 28 Mar 2023 20:31:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(logo):=20=E4=BF=AE=E5=A4=8D=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9Alogo=E6=97=B6500=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=91=E6=9C=8D=E5=8A=A1=E5=8E=82?=
 =?UTF-8?q?=E5=95=86=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/templates/common/footer.html b/templates/common/footer.html
index ad7ccff..93ffe1b 100644
--- a/templates/common/footer.html
+++ b/templates/common/footer.html
@@ -6,7 +6,7 @@
                 <th:block th:if="${#strings.isEmpty(site.logo)}" th:text="${site.title}"/>
                 <th:block th:unless="${#strings.isEmpty(site.logo)}">
                   <img class="logo-img" th:src="${site.logo}" th:alt="${site.title}" height="28">
-                  <img class="logo-img-dark" th:src="${#annotations.getOrDefault(theme.config.basic_info, 'night_logo', ${site.logo})}" th:alt="${site.title}" height="28">
+                  <img class="logo-img-dark" th:src="${#strings.defaultString(theme.config.basic_info.night_logo, ${site.logo})}" th:alt="${site.title}" height="28">
                 </th:block>
               </a>
             </li>
@@ -31,7 +31,7 @@
                 src="https://www.beian.gov.cn/portal/download" alt="公网安备" style="vertical-align: text-top; width: 1.2em; margin-right: 4px;"/>[[${theme.config.basic_info.record_number_ps}]]</a></p>
               <p th:if="${!#strings.isEmpty(theme.config.basic_info.cloud_by_logo)}">本站由<a
                 class="cloud-driven" target="_blank" rel="noopener noreferrer nofollow" th:href="${theme.config.basic_info.cloud_by_url}"><img
-                alt="云服务商" src="${theme.config.basic_info.cloud_by_logo}"/></a>提供云服务</p>
+                alt="云服务商" th:src="${theme.config.basic_info.cloud_by_logo}"/></a>提供云服务</p>
             </li>
             <li>
                 <halo:footer />
diff --git a/templates/common/navbar.html b/templates/common/navbar.html
index 771814f..1343889 100644
--- a/templates/common/navbar.html
+++ b/templates/common/navbar.html
@@ -6,7 +6,7 @@
                 <th:block th:if="${#strings.isEmpty(site.logo)}" th:text="${site.title}"/>
                 <th:block th:unless="${#strings.isEmpty(site.logo)}">
                     <img class="logo-img" th:src="${site.logo}" th:alt="${site.title}" height="28">
-                    <img class="logo-img-dark" th:src="${#annotations.getOrDefault(theme.config.basic_info, 'night_logo', ${site.logo})}" th:alt="${site.title}" height="28">
+                    <img class="logo-img-dark" th:src="${#strings.defaultString(theme.config.basic_info.night_logo, ${site.logo})}" th:alt="${site.title}" height="28">
                 </th:block>
             </a>
             <nav class="navbar-nav active-animate">